Skip to content

Commit a7ab109

Browse files
committed
Swap matrix to OS specific
1 parent 8aa4110 commit a7ab109

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

.github/workflows/publish.yml

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ jobs:
6969
needs: linux-build
7070
strategy:
7171
matrix:
72-
architecture: [arm64, amd64]
73-
runs-on: ubuntu-latest
72+
os: [ubuntu-latest, ubuntu-24.04-arm]
73+
runs-on: ${{ matrix.os }}
7474

7575
steps:
7676
- name: Checkout source
@@ -81,7 +81,13 @@ jobs:
8181
- name: Extract variables
8282
env:
8383
ARCHITECTURE: ${{ matrix.architecture }}
84+
OS_VERSION: ${{ matrix.os }}
8485
run: |
86+
if [ $OS_VERSION = "ubuntu-latest" ]; then
87+
ARCHITECTURE=amd64
88+
else
89+
ARCHITECTURE=arm64
90+
fi
8591
echo "VERSION=${GITHUB_REF_NAME#v}" >> $GITHUB_ENV
8692
echo "ARCHITECTURE=${ARCHITECTURE}" >> $GITHUB_ENV
8793
@@ -94,15 +100,15 @@ jobs:
94100
run: |
95101
sudo apt-get install devscripts build-essential debhelper-compat
96102
97-
- name: Create folder structure for ${{ matrix.architecture }} distribution
103+
- name: Create folder structure for ${{ env.ARCHITECTURE }} distribution
98104
run: |
99105
mkdir gitmastery-${VERSION}-${ARCHITECTURE}
100106
101-
- name: Download ${{ matrix.architecture }} binaries from artifacts
107+
- name: Download ${{ env.ARCHITECTURE }} binaries from artifacts
102108
uses: actions/download-artifact@v4
103109
with:
104-
name: gitmastery-${{ env.VERSION }}-linux-${{ matrix.architecture }}
105-
path: gitmastery-${{ env.VERSION }}-${{ matrix.architecture }}/
110+
name: gitmastery-${{ env.VERSION }}-linux-${{ env.ARCHITECTURE }}
111+
path: gitmastery-${{ env.VERSION }}-${{ env.ARCHITECTURE }}/
106112

107113
- name: Create upstream tarball .orig.tar.gz
108114
run: |
@@ -111,7 +117,7 @@ jobs:
111117
tree
112118
113119
- name: Generate Debian packaging files
114-
working-directory: gitmastery-${{ env.VERSION }}-${{ matrix.architecture }}
120+
working-directory: gitmastery-${{ env.VERSION }}-${{ env.ARCHITECTURE }}
115121
# TODO: Update to something agnostic
116122
env:
117123
EMAIL: woojiahao1234@gmail.com
@@ -161,6 +167,8 @@ jobs:
161167
echo """usr/bin
162168
""" > debian/gitmastery.dirs
163169
170+
mkdir -p
171+
164172
cat debian/rules
165173
166174
# Build the package
@@ -169,7 +177,7 @@ jobs:
169177
- name: Create GitHub Release
170178
uses: softprops/action-gh-release@v2
171179
with:
172-
files: gitmastery_${{ env.VERSION }}-1_${{ matrix.architecture }}.deb
180+
files: gitmastery_${{ env.VERSION }}-1_${{ env.ARCHITECTURE }}.deb
173181
env:
174182
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
175183

0 commit comments

Comments
 (0)