Skip to content

Commit 26b3053

Browse files
Racer159Racer159
authored
Merge branch 'main' into 2169-implement-new-test-cmd-wa-force-yolo-option-and-improve-the-discovery-for-zarf-pacakge-development-helpers
2 parents edc32e1 + 7a8ca14 commit 26b3053

8 files changed

Lines changed: 51 additions & 94 deletions

File tree

‎.github/actions/save-logs/action.yaml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
name: save-logs
22
description: "Save debug logs"
33

4+
inputs:
5+
suffix:
6+
description: 'Suffix to append to the debug log'
7+
required: false
8+
default: ''
9+
410
runs:
511
using: composite
612
steps:
@@ -9,7 +15,7 @@ runs:
915
sudo chown $USER /tmp/zarf-*.log || echo ""
1016
shell: bash
1117

12-
- uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
18+
- uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
1319
with:
14-
name: debug-log
20+
name: debug-log${{ inputs.suffix }}
1521
path: /tmp/zarf-*.log

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171

7272
# Upload the contents of the build directory for later stages to use
7373
- name: Upload build artifacts
74-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
74+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
7575
with:
7676
name: build-artifacts
7777
path: build/
@@ -88,7 +88,7 @@ jobs:
8888
fetch-depth: 0
8989

9090
- name: Download build artifacts
91-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
91+
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
9292
with:
9393
name: build-artifacts
9494
path: build/
@@ -99,7 +99,7 @@ jobs:
9999
- name: Make Zarf executable
100100
run: |
101101
chmod +x build/zarf
102-
102+
103103
# Before we run the regular tests we need to aggressively cleanup files to reduce disk pressure
104104
- name: Cleanup files
105105
uses: ./.github/actions/cleanup-files
@@ -132,7 +132,7 @@ jobs:
132132
uses: ./.github/actions/install-tools
133133

134134
- name: Download build artifacts
135-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
135+
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
136136
with:
137137
name: build-artifacts
138138
path: build/
@@ -170,7 +170,7 @@ jobs:
170170
HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.ZARF_ORG_PROJECT_TOKEN }}
171171

172172
- name: Save CVE report
173-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
173+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
174174
with:
175175
name: cve-report
176176
path: build/zarf-known-cves.csv

‎.github/workflows/scorecard.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
3838
# format to the repository Actions tab.
3939
- name: "Upload artifact"
40-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
40+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
4141
with:
4242
name: SARIF file
4343
path: results.sarif

‎.github/workflows/test-bigbang.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353

5454
# Upload the contents of the build directory for later stages to use
5555
- name: Upload build artifacts
56-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
56+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
5757
with:
5858
name: build-artifacts
5959
path: build/
@@ -67,7 +67,7 @@ jobs:
6767
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
6868

6969
- name: Download build artifacts
70-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
70+
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
7171
with:
7272
name: build-artifacts
7373
path: build/

‎.github/workflows/test-e2e.yml‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
# Upload the contents of the build directory for later stages to use
3939
- name: Upload build artifacts
40-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
40+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
4141
with:
4242
name: build-artifacts
4343
path: build/
@@ -51,7 +51,7 @@ jobs:
5151
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5252

5353
- name: Download build artifacts
54-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
54+
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
5555
with:
5656
name: build-artifacts
5757
path: build/
@@ -74,6 +74,8 @@ jobs:
7474
- name: Save logs
7575
if: always()
7676
uses: ./.github/actions/save-logs
77+
with:
78+
suffix: -validate-without-cluster
7779

7880
# Run the tests on k3d
7981
validate-k3d:
@@ -84,7 +86,7 @@ jobs:
8486
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
8587

8688
- name: Download build artifacts
87-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
89+
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
8890
with:
8991
name: build-artifacts
9092
path: build/
@@ -110,6 +112,8 @@ jobs:
110112
- name: Save logs
111113
if: always()
112114
uses: ./.github/actions/save-logs
115+
with:
116+
suffix: -validate-k3d
113117

114118
# Run the tests on k3s
115119
validate-k3s:
@@ -120,7 +124,7 @@ jobs:
120124
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
121125

122126
- name: Download build artifacts
123-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
127+
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
124128
with:
125129
name: build-artifacts
126130
path: build/
@@ -146,6 +150,8 @@ jobs:
146150
- name: Save logs
147151
if: always()
148152
uses: ./.github/actions/save-logs
153+
with:
154+
suffix: -validate-k3s
149155

150156
# Run the tests on kind
151157
validate-kind:
@@ -156,7 +162,7 @@ jobs:
156162
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
157163

158164
- name: Download build artifacts
159-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
165+
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
160166
with:
161167
name: build-artifacts
162168
path: build/
@@ -184,6 +190,8 @@ jobs:
184190
- name: Save logs
185191
if: always()
186192
uses: ./.github/actions/save-logs
193+
with:
194+
suffix: -validate-kind
187195

188196
# Run the tests on minikube
189197
validate-minikube:
@@ -194,7 +202,7 @@ jobs:
194202
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
195203

196204
- name: Download build artifacts
197-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
205+
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
198206
with:
199207
name: build-artifacts
200208
path: build/
@@ -220,3 +228,5 @@ jobs:
220228
- name: Save logs
221229
if: always()
222230
uses: ./.github/actions/save-logs
231+
with:
232+
suffix: -validate-minikube

‎.github/workflows/test-upgrade.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636

3737
# Upload the contents of the build directory for later stages to use
3838
- name: Upload build artifacts
39-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
39+
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
4040
with:
4141
name: build-artifacts
4242
path: build/
@@ -50,7 +50,7 @@ jobs:
5050
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
5151

5252
- name: Download build artifacts
53-
uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
53+
uses: actions/download-artifact@7a1cd3216ca9260cd8022db641d960b1db4d1be4 # v4.0.0
5454
with:
5555
name: build-artifacts
5656
path: build/

‎examples/component-webhooks/package-lock.json‎

Lines changed: 16 additions & 75 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/component-webhooks/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@
2525
"k3d-setup": "k3d cluster delete pepr-dev && k3d cluster create pepr-dev --k3s-arg '--debug@server:0'"
2626
},
2727
"dependencies": {
28-
"pepr": "^0.19.0"
28+
"pepr": "^20.0.0"
2929
}
3030
}

0 commit comments

Comments
 (0)