Skip to content

Commit

Permalink
Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
albin-johansson committed Oct 31, 2024
1 parent 57f5556 commit 0817f5c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 22 deletions.
12 changes: 5 additions & 7 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,20 @@ env:

jobs:
macos-latest-test:
runs-on: macos-14
runs-on: macos-15
if: contains(github.event.head_commit.message, '[skip-ci]') == false
steps:
- uses: actions/checkout@v4
- uses: actions/checkout@main

- name: Select Xcode version
run: sudo xcode-select --switch /Applications/Xcode_15.4.app
run: sudo xcode-select --switch /Applications/Xcode_16.1.app

- name: Install system dependencies
run: |
brew update
brew install ninja
brew install autoconf
brew install automake
- name: Cache Vcpkg
id: restore-vcpkg-and-artifacts
Expand Down Expand Up @@ -94,10 +96,6 @@ jobs:
working-directory: ./build/debug
run: ./tactile-zstd-compression-test

- name: Run Tiled TMJ format tests
working-directory: ./build/debug
run: ./tactile-tiled-tmj-format-test

- name: Run runtime tests
working-directory: ./build/debug
run: ./tactile-runtime-test
8 changes: 2 additions & 6 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ jobs:
runs-on: ubuntu-24.04
if: contains(github.event.head_commit.message, '[skip-ci]') == false
steps:
- uses: actions/checkout@v4
- uses: lukka/get-cmake@latest
- uses: actions/checkout@main
- uses: lukka/get-cmake@main
- name: Install system dependencies
run: |
sudo apt update
Expand Down Expand Up @@ -128,10 +128,6 @@ jobs:
working-directory: ./build/debug
run: ./tactile-zstd-compression-test

- name: Run Tiled TMJ format tests
working-directory: ./build/debug
run: ./tactile-tiled-tmj-format-test

- name: Run runtime tests
working-directory: ./build/debug
run: ./tactile-runtime-test
13 changes: 4 additions & 9 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
runs-on: windows-latest
if: contains(github.event.head_commit.message, '[skip-ci]') == false
steps:
- uses: actions/checkout@v4
- uses: ilammy/msvc-dev-cmd@v1.11.0
- uses: lukka/get-cmake@latest
- uses: actions/checkout@main
- uses: ilammy/msvc-dev-cmd@master
- uses: lukka/get-cmake@main

- name: Cache Vcpkg
id: restore-vcpkg-and-artifacts
uses: actions/cache@v3
uses: actions/cache@main
with:
path: |
${{env.VCPKG_ROOT}}
Expand Down Expand Up @@ -95,11 +95,6 @@ jobs:
shell: cmd
run: tactile-zstd-compression-test.exe

- name: Run Tiled TMJ format tests
working-directory: ./build/debug
shell: cmd
run: tactile-tiled-tmj-format-test.exe

- name: Run runtime tests
working-directory: ./build/debug
shell: cmd
Expand Down

0 comments on commit 0817f5c

Please sign in to comment.