Skip to content

Commit

Permalink
Fixes in github workflows
Browse files Browse the repository at this point in the history
- Runs are no longer duplicated during pulls
- Updated checkout to v3
  • Loading branch information
nadult committed Nov 26, 2023
1 parent 05c1071 commit a9cf2f7
Showing 1 changed file with 12 additions and 21 deletions.
33 changes: 12 additions & 21 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,10 @@
name: build
name: test

on:
push:
pull_request:
workflow_run:
# Use a workflow as a trigger of scheduled builds. Forked repositories can disable scheduled builds by disabling
# "scheduled" workflow, while maintaining ability to perform local CI builds.
workflows:
- scheduled
branches:
- main
- test_actions
types:
- requested
- '**'
workflow_call:

jobs:
test-windows:
Expand All @@ -21,12 +13,9 @@ jobs:
VS_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise
MSBUILD_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe
steps:
- uses: actions/checkout@v2

- name: Update submodules
shell: cmd
run: |
git submodule update --init
- uses: actions/checkout@v4
with:
submodules: 'true'

- name: Cache dependencies
id: cache-deps
Expand Down Expand Up @@ -59,11 +48,12 @@ jobs:
test-linux:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'true'

- name: Install Dependencies
run: |
git submodule update --init
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo apt-get install libsdl2-dev libfreetype-dev libvorbis-dev libogg-dev libopenal-dev libdwarf-dev libelf-dev
wget -qO - https://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo tee /etc/apt/trusted.gpg.d/lunarg.asc
Expand All @@ -88,11 +78,12 @@ jobs:
check-formatting:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
with:
submodules: 'true'

- name: Install Dependencies
run: |
git submodule update --init
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main'
sudo apt update
Expand Down

0 comments on commit a9cf2f7

Please sign in to comment.