From 311a48afdbd1efadc86d54e099869317e64dccf1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 8 Feb 2024 09:12:39 +0000 Subject: [PATCH 1/4] chore(deps): pin dependencies | datasource | package | from | to | | ----------- | ------------------------------------------- | ------ | ------ | | github-tags | actions/setup-node | v4.0.0 | v4.0.2 | | github-tags | actions/upload-artifact | v3.1.3 | v4.3.1 | | github-tags | google-github-actions/release-please-action | v3 | v4 | --- .github/actions/save-logs/action.yaml | 2 +- .github/actions/setup/action.yaml | 6 +++--- .github/workflows/commitlint.yaml | 2 +- .github/workflows/pull-request-conditionals.yaml | 4 ++-- .github/workflows/tag-and-release.yml | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/actions/save-logs/action.yaml b/.github/actions/save-logs/action.yaml index fbb3bfce9..963bb79fd 100644 --- a/.github/actions/save-logs/action.yaml +++ b/.github/actions/save-logs/action.yaml @@ -10,7 +10,7 @@ runs: sudo chown $USER /tmp/uds-*.log || echo "" shell: bash - - uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3 + - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: name: debug-log path: | diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 0c17d0909..fdbcffc8f 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -16,7 +16,7 @@ runs: using: "composite" steps: - name: Use Node.js latest - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0 + uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version: 20 @@ -33,14 +33,14 @@ runs: run: brew install defenseunicorns/tap/uds@0.8.1 - name: Login to GHCR - uses: docker/login-action@v3 + uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3 with: registry: ghcr.io username: dummy password: ${{ inputs.gh_token }} # Retries intermittent registry1 login action - - uses: Wandalen/wretry.action@v1 + - uses: Wandalen/wretry.action@62451a214c01d1b0136b4f87289d840b30d67b98 # v1 with: attempt_limit: 3 action: docker/login-action@v3 diff --git a/.github/workflows/commitlint.yaml b/.github/workflows/commitlint.yaml index 09fadf874..d28f3813b 100644 --- a/.github/workflows/commitlint.yaml +++ b/.github/workflows/commitlint.yaml @@ -19,7 +19,7 @@ jobs: fetch-depth: 0 - name: Setup Node.js - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0 + uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 - name: Install commitlint run: npm install --save-dev @commitlint/{config-conventional,cli} diff --git a/.github/workflows/pull-request-conditionals.yaml b/.github/workflows/pull-request-conditionals.yaml index ade17b107..6176a758d 100644 --- a/.github/workflows/pull-request-conditionals.yaml +++ b/.github/workflows/pull-request-conditionals.yaml @@ -24,9 +24,9 @@ jobs: lint-check: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4 - name: Use Node.js latest - uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65 # v4.0.0 + uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2 with: node-version: 20 - name: Set up Homebrew diff --git a/.github/workflows/tag-and-release.yml b/.github/workflows/tag-and-release.yml index 3b4a32ad0..f0d8c8561 100644 --- a/.github/workflows/tag-and-release.yml +++ b/.github/workflows/tag-and-release.yml @@ -15,7 +15,7 @@ jobs: steps: - name: Create release tag id: tag - uses: google-github-actions/release-please-action@v3 + uses: google-github-actions/release-please-action@cc61a07e2da466bebbc19b3a7dd01d6aecb20d1e # v4 with: command: manifest # use configs in release-please-config.json - id: release-flag From 622cb6bb505a3f2589132a70a4fb1661984d3290 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Thu, 8 Feb 2024 08:09:34 -0700 Subject: [PATCH 2/4] fix: d3conflict save-logs names --- .github/actions/save-logs/action.yaml | 8 +++++++- .github/workflows/tag-and-release.yml | 2 ++ .github/workflows/test.yaml | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/actions/save-logs/action.yaml b/.github/actions/save-logs/action.yaml index 963bb79fd..82e23aee6 100644 --- a/.github/actions/save-logs/action.yaml +++ b/.github/actions/save-logs/action.yaml @@ -1,6 +1,12 @@ name: save-logs description: "Save debug logs" +inputs: + suffix: + description: 'Suffix to append to the debug log' + required: false + default: '' + runs: using: composite steps: @@ -12,7 +18,7 @@ runs: - uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1 with: - name: debug-log + name: debug-log${{ inputs.suffix }} path: | /tmp/zarf-*.log /tmp/uds-*.log diff --git a/.github/workflows/tag-and-release.yml b/.github/workflows/tag-and-release.yml index f0d8c8561..0cc3ed6ea 100644 --- a/.github/workflows/tag-and-release.yml +++ b/.github/workflows/tag-and-release.yml @@ -54,3 +54,5 @@ jobs: - name: Save logs if: always() uses: ./.github/actions/save-logs + with: + suffix: -${{ matrix.flavor }} diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index a700587b9..8d7d822c1 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -84,3 +84,5 @@ jobs: - name: Save logs if: always() uses: ./.github/actions/save-logs + with: + suffix: -${{ inputs.package }}-${{ inputs.flavor }} From eb91a4f9f61d0b22c1558832873b61b29a1f17b4 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Thu, 8 Feb 2024 08:26:44 -0700 Subject: [PATCH 3/4] fix: test type :( --- .github/workflows/test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 8d7d822c1..e4e919952 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -85,4 +85,4 @@ jobs: if: always() uses: ./.github/actions/save-logs with: - suffix: -${{ inputs.package }}-${{ inputs.flavor }} + suffix: -${{ inputs.test_type }}-${{ inputs.package }}-${{ inputs.flavor }} From f76a85c8f1b95dd695b4cc87d284154108643f39 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Thu, 8 Feb 2024 09:11:03 -0700 Subject: [PATCH 4/4] fix: pin login-action --- .github/actions/setup/action.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 0ab1a8308..a6f1170e5 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -40,7 +40,7 @@ runs: password: ${{ inputs.gh_token }} - name: Login to registry1 - uses: docker/login-action@v3 + uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3 with: registry: registry1.dso.mil username: ${{ inputs.ib_user }}