From 093f9bbc6e0af378883a00b380addeeb4e435131 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 12:47:28 +0000 Subject: [PATCH 1/2] deps(ci): bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/patch-vendored-samba.yaml | 2 +- .github/workflows/policy-builds.yaml | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/patch-vendored-samba.yaml b/.github/workflows/patch-vendored-samba.yaml index fcbea271a..5f44ac697 100644 --- a/.github/workflows/patch-vendored-samba.yaml +++ b/.github/workflows/patch-vendored-samba.yaml @@ -54,7 +54,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Replace with updated Samba source - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: .github - name: Prepare patch working directory diff --git a/.github/workflows/policy-builds.yaml b/.github/workflows/policy-builds.yaml index d2b2898dc..deb2de9ae 100644 --- a/.github/workflows/policy-builds.yaml +++ b/.github/workflows/policy-builds.yaml @@ -90,7 +90,7 @@ jobs: image: ${{ matrix.releases }} steps: - name: Download admxgen and definition files - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: admxgen - name: Install desktop with all default package in container @@ -130,7 +130,7 @@ jobs: sudo apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get install -y distro-info - name: Download all available artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: artifacts - name: Display structure of downloaded files @@ -173,7 +173,7 @@ jobs: sudo apt-get update sudo DEBIAN_FRONTEND=noninteractive apt-get install -y distro-info - name: Download all available artifacts - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: path: artifacts - name: Display structure of downloaded files @@ -209,17 +209,17 @@ jobs: steps: - uses: actions/checkout@v4 - name: Download adm template files for "all" - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: adm-ALL path: policies/Ubuntu/all - name: Download adm template files for lts only - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: adm-LTS path: policies/Ubuntu/lts-only - name: Download generated documentation - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: generated-docs path: docs/reference/policies/ From 2cb01dee99e806fb9d8f06078097601a3b15feef Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Dec 2023 12:47:31 +0000 Subject: [PATCH 2/2] deps(ci): bump actions/upload-artifact from 3 to 4 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/patch-vendored-samba.yaml | 2 +- .github/workflows/policy-builds.yaml | 8 ++++---- .github/workflows/qa.yaml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/patch-vendored-samba.yaml b/.github/workflows/patch-vendored-samba.yaml index 5f44ac697..f2e9ea072 100644 --- a/.github/workflows/patch-vendored-samba.yaml +++ b/.github/workflows/patch-vendored-samba.yaml @@ -39,7 +39,7 @@ jobs: done - name: Upload if: ${{ steps.compute-diff.outputs.changed == 'true' }} - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: samba path: | diff --git a/.github/workflows/policy-builds.yaml b/.github/workflows/policy-builds.yaml index deb2de9ae..7c03ec1c6 100644 --- a/.github/workflows/policy-builds.yaml +++ b/.github/workflows/policy-builds.yaml @@ -23,7 +23,7 @@ jobs: mkdir /tmp/adsys CGO_ENABLED=0 go build ./cmd/admxgen/ - name: Upload admxgen - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: admxgen path: | @@ -111,7 +111,7 @@ jobs: artifacts_name=${artifacts_name/:/-} echo "artifacts_name=${artifacts_name}" >> $GITHUB_ENV - name: Generated definition files - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: policies-${{ env.artifacts_name }} path: out/* @@ -157,7 +157,7 @@ jobs: artifacts/admxgen/admxgen admx --auto-detect-releases ${allowflag} artifacts/admxgen/cmd/admxgen/defs/categories.yaml wanted/ . ls -R - name: Upload adm template files - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: adm-${{ matrix.releases }} path: Ubuntu.adm* @@ -194,7 +194,7 @@ jobs: artifacts/admxgen/admxgen doc artifacts/admxgen/cmd/admxgen/defs/categories.yaml wanted/ generated-docs/ ls -R - name: Upload adm template files - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: generated-docs path: generated-docs/* diff --git a/.github/workflows/qa.yaml b/.github/workflows/qa.yaml index 92c44d268..dd0b4adb3 100644 --- a/.github/workflows/qa.yaml +++ b/.github/workflows/qa.yaml @@ -119,7 +119,7 @@ jobs: # detection enabled and the code is mostly platform independent, this # should be a safe action to take. - name: Attach installer artifact to workflow run - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: adwatchd_setup path: installer/Output/adwatchd_setup.exe