Skip to content

Commit 79d2fdf

Browse files
filiptronicekfiliptronicek
authored
Merge branch 'main' into ft/privacy-policy-in-app
2 parents 8ecabed + 20ff1be commit 79d2fdf

File tree

291 files changed

+5111
-1342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+5111
-1342
lines changed

‎.github/actions/delete-preview/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
22

33
COPY entrypoint.sh /entrypoint.sh
44
ENTRYPOINT ["/entrypoint.sh"]

‎.github/actions/deploy-gitpod/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
22

33
COPY entrypoint.sh /entrypoint.sh
44
ENTRYPOINT ["/entrypoint.sh"]

‎.github/actions/deploy-monitoring-satellite/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
22

33
COPY entrypoint.sh /entrypoint.sh
44
ENTRYPOINT ["/entrypoint.sh"]

‎.github/actions/preview-create/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
1+
FROM eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
22

33
COPY entrypoint.sh /entrypoint.sh
44
ENTRYPOINT ["/entrypoint.sh"]

‎.github/actions/setup-environment/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ inputs:
1111
runs:
1212
using: "composite"
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- id: auth
1616
name: Authenticate to Google Cloud
1717
uses: google-github-actions/auth@v1

‎.github/workflows/authorization.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
name: Validate schema
1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
- name: Validate SpiceDB schema
1717
uses: authzed/[email protected]
1818
with:

‎.github/workflows/build.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,11 @@ jobs:
9797
cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
9898
runs-on: ${{ needs.create-runner.outputs.label }}
9999
container:
100-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
100+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
101101
outputs:
102102
previewctl_hash: ${{ steps.build.outputs.previewctl_hash }}
103103
steps:
104-
- uses: actions/checkout@v3
104+
- uses: actions/checkout@v4
105105
- uses: ./.github/actions/setup-environment
106106
with:
107107
sa_key: ${{ secrets.GCP_CREDENTIALS }}
@@ -124,7 +124,7 @@ jobs:
124124
group: ${{ github.ref == 'refs/heads/main' && github.run_id || github.sha }}-infrastructure
125125
cancel-in-progress: true
126126
steps:
127-
- uses: actions/checkout@v3
127+
- uses: actions/checkout@v4
128128
- name: Create preview environment infrastructure
129129
id: create
130130
uses: ./.github/actions/preview-create
@@ -158,15 +158,15 @@ jobs:
158158
ports:
159159
- 6379:6379
160160
container:
161-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
161+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
162162
env:
163163
DB_HOST: "mysql"
164164
DB_PORT: "23306"
165165
REDIS_HOST: "redis"
166166
# GitHub action + MySQL 8.0 need longer to initialize
167167
DB_RETRIES: 5
168168
steps:
169-
- uses: actions/checkout@v3
169+
- uses: actions/checkout@v4
170170
- uses: ./.github/actions/setup-environment
171171
with:
172172
sa_key: ${{ secrets.GCP_CREDENTIALS }}
@@ -334,7 +334,7 @@ jobs:
334334
group: ${{ github.ref == 'refs/heads/main' && github.run_id || github.sha }}-install
335335
cancel-in-progress: ${{ needs.configuration.outputs.is_main_branch == 'false' }}
336336
steps:
337-
- uses: actions/checkout@v3
337+
- uses: actions/checkout@v4
338338
- name: Deploy Gitpod to the preview environment
339339
id: deploy-gitpod
340340
uses: ./.github/actions/deploy-gitpod
@@ -379,7 +379,7 @@ jobs:
379379
group: ${{ github.ref == 'refs/heads/main' && github.run_id || github.sha }}-monitoring
380380
cancel-in-progress: true
381381
steps:
382-
- uses: actions/checkout@v3
382+
- uses: actions/checkout@v4
383383
- name: Deploy monitoring satellite to the preview environment
384384
id: deploy-monitoring-satellite
385385
uses: ./.github/actions/deploy-monitoring-satellite
@@ -398,13 +398,13 @@ jobs:
398398
- create-runner
399399
runs-on: ${{ needs.create-runner.outputs.label }}
400400
container:
401-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
401+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
402402
if: needs.configuration.outputs.with_integration_tests != ''
403403
concurrency:
404404
group: ${{ needs.configuration.outputs.preview_name }}-integration-test
405405
cancel-in-progress: true
406406
steps:
407-
- uses: actions/checkout@v3
407+
- uses: actions/checkout@v4
408408
- uses: ./.github/actions/setup-environment
409409
with:
410410
sa_key: ${{ secrets.GCP_CREDENTIALS }}

‎.github/workflows/code-nightly.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ jobs:
1616
runs-on: ${{ needs.create-runner.outputs.label }}
1717
needs: [create-runner]
1818
container:
19-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
19+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222
- uses: ./.github/actions/setup-environment
2323
with:
2424
sa_key: ${{ secrets.GCP_CREDENTIALS }}

‎.github/workflows/configcat.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Scan repository for configcat code references
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@v4
1313
- name: Scan & upload
1414
uses: configcat/scan-repository@v1
1515
with:

‎.github/workflows/ide-integration-tests.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
runs-on: ${{ needs.create-runner.outputs.label }}
3232
needs: [create-runner]
3333
container:
34-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
34+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
3535
outputs:
3636
name: ${{ steps.configuration.outputs.name }}
3737
version: ${{ steps.configuration.outputs.version }}
@@ -77,7 +77,7 @@ jobs:
7777
concurrency:
7878
group: ${{ needs.configuration.outputs.name }}-infrastructure
7979
steps:
80-
- uses: actions/checkout@v3
80+
- uses: actions/checkout@v4
8181
- name: Create preview environment infrastructure
8282
id: create
8383
uses: ./.github/actions/preview-create
@@ -100,12 +100,12 @@ jobs:
100100
needs: [configuration, infrastructure, create-runner]
101101
runs-on: ${{ needs.create-runner.outputs.label }}
102102
container:
103-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
103+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
104104
volumes:
105105
- /var/tmp:/var/tmp
106106
- /tmp:/tmp
107107
steps:
108-
- uses: actions/checkout@v3
108+
- uses: actions/checkout@v4
109109
- name: Integration Test
110110
shell: bash
111111
env:
@@ -189,7 +189,7 @@ jobs:
189189
if: github.event.inputs.skip_delete != 'true' && always()
190190
runs-on: ${{ needs.create-runner.outputs.label }}
191191
steps:
192-
- uses: actions/checkout@v3
192+
- uses: actions/checkout@v4
193193
- name: Delete preview environment
194194
uses: ./.github/actions/delete-preview
195195
with:

‎.github/workflows/jetbrains-update-plugin-platform-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout Repository
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
- name: Get Current Platform Version
3737
id: current-version
3838
run: |

‎.github/workflows/jetbrains-updates.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
update-jetbrains:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@v4
1313
- name: Check for updates
1414
run: |
1515
cd ./components/ide/jetbrains/image/gha-update-image

‎.github/workflows/lacework-inline-scanner.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ jobs:
5151
needs: [configuration,create-runner]
5252
if: ${{ needs.configuration.outputs.skip == 'false' }}
5353
container:
54-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
54+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
5555
steps:
5656
# Most of this is taken over from the Build workflow/preview-env-check-regressions workflow
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858
- uses: ./.github/actions/setup-environment
5959
with:
6060
sa_key: ${{ secrets.GCP_CREDENTIALS }}

‎.github/workflows/preview-env-check-regressions.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
concurrency:
6363
group: ${{ needs.configuration.outputs.name }}-infrastructure
6464
steps:
65-
- uses: actions/checkout@v3
65+
- uses: actions/checkout@v4
6666
- name: Create preview environment infrastructure
6767
id: create
6868
uses: ./.github/actions/preview-create
@@ -85,12 +85,12 @@ jobs:
8585
if: ${{ needs.configuration.outputs.skip == 'false' }}
8686
runs-on: ${{ needs.create-runner.outputs.label }}
8787
container:
88-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
88+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
8989
volumes:
9090
- /var/tmp:/var/tmp
9191
- /tmp:/tmp
9292
steps:
93-
- uses: actions/checkout@v3
93+
- uses: actions/checkout@v4
9494
- name: Check
9595
shell: bash
9696
env:
@@ -172,7 +172,7 @@ jobs:
172172
if: always()
173173
runs-on: ${{ needs.create-runner.outputs.label }}
174174
steps:
175-
- uses: actions/checkout@v3
175+
- uses: actions/checkout@v4
176176
- name: Delete preview environment
177177
uses: ./.github/actions/delete-preview
178178
with:

‎.github/workflows/preview-env-delete.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
runs-on: ${{ needs.create-runner.outputs.label }}
2020
needs: [create-runner]
2121
steps:
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v4
2323
- name: Delete preview environment
2424
uses: ./.github/actions/delete-preview
2525
with:

‎.github/workflows/preview-env-gc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ jobs:
1515
runs-on: ${{ needs.create-runner.outputs.label }}
1616
needs: [create-runner]
1717
container:
18-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
18+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
1919
outputs:
2020
names: ${{ steps.set-matrix.outputs.names }}
2121
count: ${{ steps.set-matrix.outputs.count }}
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424
with:
2525
fetch-depth: 0
2626
- name: Compute matrix
@@ -57,7 +57,7 @@ jobs:
5757
matrix:
5858
name: ${{ fromJSON(needs.stale.outputs.names) }}
5959
steps:
60-
- uses: actions/checkout@v3
60+
- uses: actions/checkout@v4
6161
- name: Delete preview environment ${{ matrix.name }}
6262
uses: ./.github/actions/delete-preview
6363
with:

‎.github/workflows/public-api.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
build:
88
runs-on: ubuntu-latest
99
steps:
10-
- uses: actions/checkout@v3
10+
- uses: actions/checkout@v4
1111
- uses: bufbuild/buf-setup-action@v1
1212
with:
1313
github_token: ${{ secrets.GITHUB_TOKEN }}

‎.github/workflows/update-image-digest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-requests: write
1515

1616
steps:
17-
- uses: actions/checkout@v3
17+
- uses: actions/checkout@v4
1818

1919
- name: Set git identity
2020
run: |

‎.github/workflows/workspace-integration-tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
runs-on: ${{ needs.create-runner.outputs.label }}
4646
needs: [create-runner]
4747
container:
48-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
48+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
4949
outputs:
5050
name: ${{ steps.configuration.outputs.name }}
5151
version: ${{ steps.configuration.outputs.version }}
@@ -112,7 +112,7 @@ jobs:
112112
concurrency:
113113
group: ${{ needs.configuration.outputs.name }}-infrastructure
114114
steps:
115-
- uses: actions/checkout@v3
115+
- uses: actions/checkout@v4
116116
- name: Create preview environment infrastructure
117117
id: create
118118
uses: ./.github/actions/preview-create
@@ -135,9 +135,9 @@ jobs:
135135
needs: [configuration, infrastructure, create-runner]
136136
runs-on: ${{ needs.create-runner.outputs.label }}
137137
container:
138-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
138+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
139139
steps:
140-
- uses: actions/checkout@v3
140+
- uses: actions/checkout@v4
141141
- id: auth
142142
uses: google-github-actions/auth@v1
143143
with:
@@ -166,9 +166,9 @@ jobs:
166166
if: inputs.skip_delete != 'true' && always()
167167
runs-on: ${{ needs.create-runner.outputs.label }}
168168
container:
169-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
169+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
170170
steps:
171-
- uses: actions/checkout@v3
171+
- uses: actions/checkout@v4
172172
- name: Delete preview environment
173173
uses: ./.github/actions/delete-preview
174174
with:

‎.gitpod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:at-node-18-17-1-gha.15610
1+
image: eu.gcr.io/gitpod-core-dev/dev/dev-environment:aledbf-update-image-gha.17642
22
workspaceLocation: gitpod/gitpod-ws.code-workspace
33
checkoutLocation: gitpod
44
ports:

‎WORKSPACE.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ defaultArgs:
77
publishToNPM: true
88
publishToJBMarketplace: true
99
localAppVersion: unknown
10-
codeCommit: 8bcdbe5e6e097191649984c8329af15a3e6b3066
11-
codeVersion: 1.83.0
10+
codeCommit: 7e9dd80fe5c75101c3b3e9ba71c0ff63cbd09768
11+
codeVersion: 1.82.2
1212
codeQuality: stable
1313
noVerifyJBPlugin: false
1414
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2023.2.2.tar.gz"

‎components/BUILD.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,15 +172,15 @@ scripts:
172172
- test/**/*
173173
- dev/**/*
174174
script: |
175-
leeway exec --filter-type go -v -- go mod tidy -compat=1.20
175+
leeway exec --filter-type go -v -- go mod tidy -compat=1.21
176176
177177
# not all the code is present in leeway.
178178
# ensure we update everything containing a go.mod file
179179
for COMPONENT in $(find . -name go.mod); do
180180
DIRECTORY=$(dirname $COMPONENT)
181181
echo "$DIRECTORY"
182182
pushd $DIRECTORY > /dev/null
183-
go mod tidy -compat=1.20 -v
183+
go mod tidy -compat=1.21 -v
184184
popd > /dev/null
185185
done
186186

0 commit comments

Comments
 (0)