Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions .github/workflows/app_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,9 @@ jobs:

steps:

- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
if: ${{ !matrix.SELF_HOSTED }}
with:
python-version: '3.12.x'
Expand Down Expand Up @@ -186,6 +186,9 @@ jobs:
echo "Setting Xcode version"
sudo xcode-select -s "/Applications/Xcode_16.4.app/Contents/Developer/"

echo "Untapping unused taps to avoid Homebrew trust warnings"
brew untap aws/tap azure/bicep || true

echo "Using brew to install ninja"
brew install md5sha1sum ccache

Expand Down Expand Up @@ -330,7 +333,7 @@ jobs:
# Note: I'm picking up the ccache before I do the conan cache, otherwise on windows when trying to hashFiles('**/CMakeLists.txt') it looks into the conan folder which fails
# To prevent problems, changing to multiple more specific glob patterns
- name: Setup CCache
uses: actions/cache@v4
uses: actions/cache@v5
id: cacheccache
if: ${{ !matrix.SELF_HOSTED }}
with:
Expand All @@ -349,7 +352,7 @@ jobs:
ccache --zero-stats

- name: Setup Conan Cache
uses: actions/cache@v4
uses: actions/cache@v5
id: cacheconan
if: ${{ !matrix.SELF_HOSTED }}
with:
Expand Down Expand Up @@ -384,7 +387,7 @@ jobs:
- name: Cache Qt and SDK
id: cachebuild
if: ${{ !matrix.SELF_HOSTED }}
uses: actions/cache@v3
uses: actions/cache@v5
with:
path: |
build/Qt-install
Expand Down Expand Up @@ -723,7 +726,7 @@ jobs:
arch: arm64

steps:
- uses: actions/checkout@v4 # Still need code checked out to get testing scripts
- uses: actions/checkout@v5 # Still need code checked out to get testing scripts
with:
path: checkout

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_osm_versions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: ruby/setup-ruby@v1
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/clangformat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Run clang-format against C++ files touched by the PR
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/cppcheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- name: Install cppcheck
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docker-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

# BuildKit is required for the cache-from/cache-to directives below.
- name: Set up Docker Buildx
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/export_standards_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
with:
python-version: '3.12.x'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release_notes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- uses: actions/checkout@v5

- uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2

- uses: actions/setup-python@v5
- uses: actions/setup-python@v6
with:
python-version: '3.8.x'

Expand Down
Loading