Skip to content

Commit

Permalink
Merge pull request #13175 from daschuer/workflow_warnings
Browse files Browse the repository at this point in the history
Fix 2.4 workflow warnings
  • Loading branch information
JoergAtGithub authored Apr 29, 2024
2 parents 2873f5d + 60e4fe5 commit 96a03e8
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 26 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
name: ${{ matrix.name }}
steps:
- name: Check out repository
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1
- name: Install build dependencies
run: tools/debian_buildenv.sh setup
- name: Create build directory
Expand Down Expand Up @@ -111,7 +111,7 @@ jobs:
..
working-directory: build
- name: Set up problem matcher
uses: ammaraskar/gcc-problem-matcher@0.2.0
uses: ammaraskar/gcc-problem-matcher@0.3.0
# Work around https://github.com/actions/runner-images/issues/8659
- name: "Remove GCC 13 from runner image (workaround)"
shell: bash
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
artifact-windows-win64: ${{ steps.prepare_deploy.outputs.artifact-windows-win64 }}
steps:
- name: "Check out repository"
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1
with:
# This is necessary for making `git describe` work.
fetch-depth: 0
Expand All @@ -168,7 +168,7 @@ jobs:
run: git fetch origin --force --tags

- name: "[macOS] Set up cmake"
uses: jwlawson/actions-setup-cmake@v1.13
uses: jwlawson/actions-setup-cmake@v2.0
# Ubuntu 22.04 should use the CMake version from the repos.
if: runner.os == 'macOS'
with:
Expand All @@ -177,7 +177,7 @@ jobs:
cmake-version: "3.19.x"

- name: "[Windows] Set up cmake"
uses: jwlawson/actions-setup-cmake@v1.13
uses: jwlawson/actions-setup-cmake@v2.0
# Ubuntu 22.04 should use the CMake version from the repos.
if: runner.os == 'Windows'
with:
Expand All @@ -201,7 +201,7 @@ jobs:

- name: "[macOS/Windows] Set up build environment cache"
if: runner.os != 'Linux'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ matrix.buildenv_basepath }}
key: ${{ runner.os }}-buildenv-${{ env.BUILDENV_NAME }}
Expand Down Expand Up @@ -242,7 +242,7 @@ jobs:

- name: "[Ubuntu/macOS] Set up GitHub cache for ccache"
if: runner.os != 'windows'
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: ${{ matrix.compiler_cache_path }}
key: ${{ matrix.os }}-${{ matrix.compiler_cache_id }}-${{ github.head_ref }}-${{ github.run_number }}
Expand Down Expand Up @@ -286,11 +286,11 @@ jobs:

- name: "[Ubuntu/macOS] Set up gcc/clang problem matcher"
if: runner.os != 'Windows'
uses: ammaraskar/gcc-problem-matcher@0.2.0
uses: ammaraskar/gcc-problem-matcher@0.3.0

- name: "[Windows] Set up MSVC problem matcher"
if: runner.os == 'Windows'
uses: ammaraskar/msvc-problem-matcher@0.2.0
uses: ammaraskar/msvc-problem-matcher@0.3.0

- name: "Build"
run: cmake --build . --config RelWithDebInfo
Expand Down Expand Up @@ -332,7 +332,7 @@ jobs:
env:
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
if: runner.os == 'Windows' && env.AZURE_TENANT_ID
uses: azure/azure-code-signing-action@v0.2.22
uses: azure/azure-code-signing-action@v0.3.0
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down Expand Up @@ -387,7 +387,7 @@ jobs:
env:
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
if: runner.os == 'Windows' && env.AZURE_TENANT_ID
uses: azure/azure-code-signing-action@v0.2.22
uses: azure/azure-code-signing-action@v0.3.0
with:
azure-tenant-id: ${{ secrets.AZURE_TENANT_ID }}
azure-client-id: ${{ secrets.AZURE_CLIENT_ID }}
Expand Down Expand Up @@ -489,7 +489,7 @@ jobs:
- name: "Upload GitHub Actions artifacts"
if: matrix.artifacts_path != null
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4.3.1
with:
name: ${{ matrix.artifacts_name }}
path: ${{ matrix.artifacts_path }}
Expand All @@ -503,7 +503,7 @@ jobs:
if: always()
steps:
- name: "Check out repository"
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- name: Get current branch name
uses: nelonoel/branch-name@v1.0.1
- name: Start workflow run on manual repository
uses: peter-evans/repository-dispatch@v2
uses: peter-evans/repository-dispatch@v3
if: env.MIXXXBOT_TOKEN != null
with:
token: ${{ env.MIXXXBOT_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/git.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v2.0.0
- uses: actions/checkout@v4.1.1
- name: Block Fixup Commit Merge
uses: 13rac1/block-fixup-merge-action@v2.0.0
10 changes: 5 additions & 5 deletions .github/workflows/pre-commit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
container: holzhaus/mixxx-ci:20220930
steps:
- name: "Check out repository"
uses: actions/checkout@v4
uses: actions/checkout@v4.1.1
with:
# Unfortunately we need the whole history and can't use a shallow clone
# because the Appstream Metadata hook parses the history to find the
Expand All @@ -38,7 +38,7 @@ jobs:
git config --global --list
- name: "Detect code style issues (push)"
uses: pre-commit/action@v3.0.0
uses: pre-commit/action@v3.0.1
if: github.event_name == 'push'
# There are too many files in the repo that have formatting issues. We'll
# disable these checks for now when pushing directly (but still run these
Expand All @@ -47,7 +47,7 @@ jobs:
SKIP: clang-format,eslint,no-commit-to-branch

- name: "Detect code style issues (pull_request)"
uses: pre-commit/action@v3.0.0
uses: pre-commit/action@v3.0.1
if: github.event_name == 'pull_request'
env:
SKIP: no-commit-to-branch
Expand All @@ -67,14 +67,14 @@ jobs:

- name: "Upload patch artifact"
if: failure() && env.UPLOAD_PATCH_FILE != null
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4.3.1
with:
name: ${{ env.UPLOAD_PATCH_FILE }}
path: ${{ env.UPLOAD_PATCH_FILE }}

- name: "Upload pre-commit.log"
if: failure() && env.UPLOAD_PATCH_FILE == null
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4.3.1
with:
name: pre-commit.log
path: /github/home/.cache/pre-commit/pre-commit.log
Expand Down
13 changes: 7 additions & 6 deletions tools/deploy.py
Original file line number Diff line number Diff line change
Expand Up @@ -196,13 +196,14 @@ def prepare_deployment(args):
if os.getenv("CI") == "true":
# Set GitHub Actions job output
print(
"::set-output name=artifact-{}-{}::{}".format(
download_slug,
package_slug,
json.dumps(metadata),
)
'echo "{artifact-'
+ download_slug
+ "-"
+ package_slug
+ "}={"
+ json.dumps(metadata)
+ '}" >> $GITHUB_OUTPUT'
)

return 0


Expand Down

0 comments on commit 96a03e8

Please sign in to comment.