Skip to content

Commit ffa12db

Browse files
committed
Update CI workflow for architecture and naming consistency
Replaced 'x86_64' and 'aarch64' with 'amd64' and 'arm64' for consistency in architecture naming. Updated macOS 'os_name' to 'darwin' and removed 'v' prefix from artifact filenames to standardize naming conventions. Adjusted related conditions and paths in the workflow.
1 parent 4ba2749 commit ffa12db

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

.github/workflows/ci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,11 +123,11 @@ jobs:
123123
# Linux architectures
124124
- os: ubuntu-latest
125125
os_name: linux
126-
arch: x86_64
126+
arch: amd64
127127
python-version: "3.12"
128128
- os: ubuntu-latest
129129
os_name: linux
130-
arch: aarch64
130+
arch: arm64
131131
python-version: "3.12"
132132
cross_compile: true
133133
# Windows architectures
@@ -142,11 +142,11 @@ jobs:
142142
cross_compile: true
143143
# macOS architectures
144144
- os: macos-13 # Intel-based runner
145-
os_name: macos
146-
arch: x86_64
145+
os_name: darwin
146+
arch: amd64
147147
python-version: "3.12"
148148
- os: macos-14 # ARM-based runner (M1/M2)
149-
os_name: macos
149+
os_name: darwin
150150
arch: arm64
151151
python-version: "3.12"
152152
runs-on: ${{ matrix.os }}
@@ -204,13 +204,13 @@ jobs:
204204
python -m PyInstaller --onefile --name tzst --console --target-arch arm64 --icon docs/_static/favicon.ico src/main.py
205205
206206
- name: Setup cross-compilation for Linux ARM64
207-
if: matrix.os == 'ubuntu-latest' && matrix.arch == 'aarch64'
207+
if: matrix.os == 'ubuntu-latest' && matrix.arch == 'arm64'
208208
run: |
209209
sudo apt-get update
210210
sudo apt-get install -y gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu
211211
212212
- name: Build binary for ARM64 on Linux
213-
if: matrix.os == 'ubuntu-latest' && matrix.arch == 'aarch64'
213+
if: matrix.os == 'ubuntu-latest' && matrix.arch == 'arm64'
214214
env:
215215
CC: aarch64-linux-gnu-gcc
216216
run: |
@@ -236,19 +236,19 @@ jobs:
236236
if: matrix.os != 'windows-latest'
237237
run: |
238238
cd archive
239-
zip -r ../tzst-v${{ steps.version.outputs.version }}-${{ matrix.os_name }}-${{ matrix.arch }}.zip .
239+
zip -r ../tzst-${{ steps.version.outputs.version }}-${{ matrix.os_name }}-${{ matrix.arch }}.zip .
240240
241241
- name: Create zip archive (Windows)
242242
if: matrix.os == 'windows-latest'
243243
run: |
244244
cd archive
245-
Compress-Archive -Path * -DestinationPath ../tzst-v${{ steps.version.outputs.version }}-${{ matrix.os_name }}-${{ matrix.arch }}.zip
245+
Compress-Archive -Path * -DestinationPath ../tzst-${{ steps.version.outputs.version }}-${{ matrix.os_name }}-${{ matrix.arch }}.zip
246246
247247
- name: Upload binary artifacts
248248
uses: actions/upload-artifact@v4
249249
with:
250250
name: binary-${{ matrix.os_name }}-${{ matrix.arch }}
251-
path: tzst-v${{ steps.version.outputs.version }}-${{ matrix.os_name }}-${{ matrix.arch }}.zip
251+
path: tzst-${{ steps.version.outputs.version }}-${{ matrix.os_name }}-${{ matrix.arch }}.zip
252252

253253
create-release:
254254
needs: [publish, build-binaries]
@@ -282,10 +282,10 @@ jobs:
282282
- name: Upload Release Assets
283283
run: |
284284
echo "Available files:"
285-
ls -la tzst-v${{ steps.version.outputs.version }}-*.zip 2>/dev/null || echo "No zip files found"
285+
ls -la tzst-${{ steps.version.outputs.version }}-*.zip 2>/dev/null || echo "No zip files found"
286286
287287
success=0
288-
for file in tzst-v${{ steps.version.outputs.version }}-*.zip; do
288+
for file in tzst-${{ steps.version.outputs.version }}-*.zip; do
289289
if [ -f "$file" ]; then
290290
echo "Uploading $file"
291291
if gh release upload ${{ github.ref_name }} "$file" --clobber; then

0 commit comments

Comments
 (0)