Skip to content

Commit a5ff213

Browse files
committed
Fix build trigger on non-master branches
1 parent 5e2db36 commit a5ff213

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

.github/workflows/Tagged.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ on:
1111
env:
1212
Configuration: Release
1313
DSOALRepo: kcat/dsoal
14+
DSOALBranch: ${{github.ref_name}}
1415
OpenALSoftRepo: kcat/openal-soft
16+
OpenALSoftBranch: master
1517

1618
permissions:
1719
contents: write
@@ -35,18 +37,16 @@ jobs:
3537

3638
- name: Clone DSOAL
3739
run: |
38-
git clone https://github.com/${{env.DSOALRepo}}.git .
40+
git clone --branch ${{env.DSOALBranch}} https://github.com/${{env.DSOALRepo}}.git .
3941
git fetch --tags
4042
echo "DSOALCommitTag=$(git describe --tags)" >> $env:GITHUB_ENV
41-
echo "DSOALBranch=$(git rev-parse --abbrev-ref HEAD)" >> $env:GITHUB_ENV
4243
4344
- name: Clone OpenAL Soft
4445
run: |
45-
git clone https://github.com/${{env.OpenALSoftRepo}}.git
46+
git clone --branch ${{env.OpenALSoftBranch}} https://github.com/${{env.OpenALSoftRepo}}.git
4647
cd "openal-soft"
4748
git fetch --tags
4849
echo "OpenALSoftCommitTag=$(git describe --tags --abbrev=0 --match *.*.*)" >> $env:GITHUB_ENV
49-
echo "OpenALSoftBranch=$(git rev-parse --abbrev-ref HEAD)" >> $env:GITHUB_ENV
5050
cd "${{github.workspace}}"
5151
5252
- name: Clone OpenAL Soft v${{env.OpenALSoftCommitTag}}

.github/workflows/Untagged.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Untagged build
33
on:
44
push:
55
branches:
6-
- 'master'
6+
- '*'
77
tags-ignore:
88
- '*.*.*'
99
paths-ignore:
@@ -15,7 +15,9 @@ on:
1515
env:
1616
Configuration: Release
1717
DSOALRepo: kcat/dsoal
18+
DSOALBranch: ${{github.ref_name}}
1819
OpenALSoftRepo: kcat/openal-soft
20+
OpenALSoftBranch: master
1921

2022
permissions:
2123
contents: write
@@ -39,13 +41,11 @@ jobs:
3941

4042
- name: Clone DSOAL
4143
run: |
42-
git clone https://github.com/${{env.DSOALRepo}}.git .
43-
echo "DSOALBranch=$(git rev-parse --abbrev-ref HEAD)" >> $env:GITHUB_ENV
44+
git clone --branch ${{env.DSOALBranch}} https://github.com/${{env.DSOALRepo}}.git .
4445
4546
- name: Clone OpenAL Soft
4647
run: |
47-
git clone https://github.com/${{env.OpenALSoftRepo}}.git
48-
echo "OpenALSoftBranch=$(git rev-parse --abbrev-ref HEAD)" >> $env:GITHUB_ENV
48+
git clone --branch ${{env.OpenALSoftBranch}} https://github.com/${{env.OpenALSoftRepo}}.git
4949
5050
- name: Get version details
5151
run: |

0 commit comments

Comments
 (0)