Skip to content

Commit 4666ada

Browse files
ci: Fix the triggering logic for e2e (#578)
* ci: Fix the triggering logic for e2e * ci: moving to DeterminateSystems/nix-installer-action@v20 (#576) * fix: CVE-2025-22868 --------- Co-authored-by: Abhay Aggrawal <[email protected]>
1 parent f20bc14 commit 4666ada

File tree

4 files changed

+19
-14
lines changed

4 files changed

+19
-14
lines changed

.github/workflows/build-dev.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,12 @@ on:
77
- main
88
- 'release-*'
99
pull_request:
10-
paths:
11-
- '.github/**'
10+
types: [opened, synchronize, reopened, labeled]
1211
pull_request_target:
13-
paths-ignore:
14-
- '.github/**'
12+
types: [opened, synchronize, reopened, labeled]
13+
branches:
14+
- main
15+
- 'release-*'
1516
jobs:
1617
check_approvals:
1718
runs-on: ubuntu-latest
@@ -108,8 +109,7 @@ jobs:
108109
- "capx-feature-test"
109110
- "scaling"
110111
fail-fast: false
111-
if: ${{ (github.event_name == 'pull_request' && needs.check_approvals.outputs.external_pr == 'false') || (github.event_name == 'pull_request_target' && needs.check_approvals.outputs.external_pr == 'true' && needs.check_approvals.outputs.check_approvals == 'true') }}
112-
needs: check_approvals
112+
needs: check_approvals
113113
uses: ./.github/workflows/e2e.yaml
114114
with:
115115
e2e-labels: ${{ matrix.e2e-labels }}

.github/workflows/e2e.yaml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,19 @@ jobs:
1919
with:
2020
ref: "${{ github.event.pull_request.head.sha }}"
2121

22-
# Install nix using cachix/install-nix-action if running on ARC runners
23-
# See: https://github.com/DeterminateSystems/nix-installer-action/issues/68
22+
# Install nix using DeterminateSystems/nix-installer-action if running on ARC runners
23+
# This can be removed once jetify-com/devbox-install-action has a release that includes
24+
# at least `DeterminateSystems/nix-installer-action@v19` which includes the fix in
25+
# https://github.com/DeterminateSystems/nix-installer-action/issues/68
2426
- name: Install Nix on self-hosted ARC runners
25-
uses: cachix/install-nix-action@V27
27+
uses: DeterminateSystems/nix-installer-action@v20
2628
with:
27-
github_access_token: ${{ secrets.GITHUB_TOKEN }}
29+
github-token: ${{ secrets.GITHUB_TOKEN }}
30+
logger: pretty
31+
extra-conf: experimental-features = ca-derivations fetch-closure
2832

2933
- name: Install devbox
30-
uses: jetify-com/devbox-install-action@v0.11.0
34+
uses: jetify-com/devbox-install-action@v0.13.0
3135
with:
3236
enable-cache: "false"
3337
skip-nix-installation: "true"

go.mod

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,5 +180,6 @@ require (
180180
replace (
181181
// CVE fixes for https://avd.aquasec.com/nvd/2024/cve-2024-45338
182182
golang.org/x/net => golang.org/x/net v0.33.0
183+
golang.org/x/oauth2 => golang.org/x/oauth2 v0.27.0
183184
sigs.k8s.io/kind v0.20.0 => sigs.k8s.io/kind v0.22.0
184185
)

go.sum

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
2+
cloud.google.com/go/compute/metadata v0.3.0/go.mod h1:zFmK7XCadkQkj6TtorcaGlCW1hT1fIilQDwofLpJ20k=
23
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
34
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
45
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -443,9 +444,8 @@ golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
443444
golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
444445
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
445446
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
446-
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
447-
golang.org/x/oauth2 v0.21.0 h1:tsimM75w1tF/uws5rbeHzIWxEqElMehnc+iW793zsZs=
448-
golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
447+
golang.org/x/oauth2 v0.27.0 h1:da9Vo7/tDv5RH/7nZDz1eMGS/q1Vv1N/7FCrBhI9I3M=
448+
golang.org/x/oauth2 v0.27.0/go.mod h1:onh5ek6nERTohokkhCD/y2cV4Do3fxFHFuAejCkRWT8=
449449
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
450450
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
451451
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=

0 commit comments

Comments
 (0)