Skip to content

Commit b017e69

Browse files
committed
Update workflows
1 parent a421f1c commit b017e69

2 files changed

Lines changed: 55 additions & 23 deletions

File tree

.github/workflows/package-build.yml

Lines changed: 54 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2,57 +2,89 @@ name: Package Build
22

33
on:
44
workflow_dispatch:
5+
inputs:
6+
version:
7+
description: 'Release version'
8+
required: true
9+
type: string
510

611
jobs:
712
linux:
813
runs-on: ubuntu-latest
914
steps:
10-
- uses: actions/checkout@v4
15+
- uses: actions/checkout@v6
1116
- uses: actions-rust-lang/setup-rust-toolchain@v1
1217
with:
1318
components: rustfmt
14-
- run: sudo apt update && sudo apt install libasound2-dev pkg-config p7zip-full -y
19+
- run: cargo clean && rustup update
20+
- run: sudo apt update && sudo apt upgrade -y && sudo apt install libasound2-dev pkg-config 7zip -y
1521
- run: cargo build --release
1622
- run: |
17-
mkdir Geometry-Rays
18-
cp ./target/release/geometry-rays-fyre ./Geometry-Rays
19-
cp -r Resources mods save-data Geometry-Rays
20-
- uses: actions/upload-artifact@v4
23+
mkdir Geometry-Rays-x64
24+
cp ./target/release/geometry-rays-fyre ./Geometry-Rays-x64
25+
cp -r Resources mods save-data Geometry-Rays-x64
26+
- run: cargo clean
27+
- uses: actions/upload-artifact@v7
2128
with:
22-
name: Geometry-Rays-linux
23-
path: Geometry-Rays
29+
name: Geometry-Rays-${{ inputs.version }}-linux-x64
30+
path: Geometry-Rays-x64
2431

2532
windows:
2633
runs-on: windows-latest
2734
steps:
28-
- uses: actions/checkout@v4
35+
- uses: actions/checkout@v6
2936
- uses: actions-rust-lang/setup-rust-toolchain@v1
3037
with:
3138
components: rustfmt
39+
- run: cargo clean && rustup update
3240
- run: cargo build --release
3341
- run: |
34-
mkdir Geometry-Rays
35-
Copy-Item .\target\release\geometry-rays-fyre.exe .\Geometry-Rays\
36-
Copy-Item -Recurse Resources,mods,'save-data' -Destination .\Geometry-Rays
42+
mkdir Geometry-Rays-x64
43+
Copy-Item .\target\release\geometry-rays-fyre.exe .\Geometry-Rays-x64\
44+
Copy-Item -Recurse Resources,mods,'save-data' -Destination .\Geometry-Rays-x64
3745
shell: pwsh
38-
- uses: actions/upload-artifact@v4
46+
- run: rustup target add aarch64-pc-windows-msvc
47+
- run: cargo build --target aarch64-pc-windows-msvc --release
48+
- run: |
49+
mkdir Geometry-Rays-arm64
50+
Copy-Item .\target\aarch64-pc-windows-msvc\release/geometry-rays-fyre.exe .\Geometry-Rays-arm64\
51+
Copy-Item -Recurse Resources,mods,'save-data' -Destination .\Geometry-Rays-arm64
52+
shell: pwsh
53+
- run: cargo clean
54+
- uses: actions/upload-artifact@v7
55+
with:
56+
name: Geometry-Rays-${{ inputs.version }}-windows-x64
57+
path: Geometry-Rays-x64
58+
- uses: actions/upload-artifact@v7
3959
with:
40-
name: Geometry-Rays-windows
41-
path: Geometry-Rays
60+
name: Geometry-Rays-${{ inputs.version }}-windows-arm64
61+
path: Geometry-Rays-arm64
4262

4363
macos:
4464
runs-on: macos-latest
4565
steps:
46-
- uses: actions/checkout@v4
66+
- uses: actions/checkout@v6
4767
- uses: actions-rust-lang/setup-rust-toolchain@v1
4868
with:
4969
components: rustfmt
70+
- run: cargo clean && rustup update
5071
- run: cargo build --release --target aarch64-apple-darwin
5172
- run: |
52-
mkdir Geometry-Rays
53-
cp ./target/aarch64-apple-darwin/release/geometry-rays-fyre ./Geometry-Rays/geometry-rays
54-
cp -r Resources mods save-data Geometry-Rays
55-
- uses: actions/upload-artifact@v4
73+
mkdir Geometry-Rays-arm64
74+
cp ./target/aarch64-apple-darwin/release/geometry-rays-fyre ./Geometry-Rays-arm64
75+
cp -r Resources mods save-data Geometry-Rays-arm64
76+
- run: rustup target install x86_64-apple-darwin
77+
- run: cargo build --release --target x86_64-apple-darwin
78+
- run: |
79+
mkdir Geometry-Rays-x64
80+
cp ./target/x86_64-apple-darwin/release/geometry-rays-fyre ./Geometry-Rays-x64
81+
cp -r Resources mods save-data Geometry-Rays-x64
82+
- run: cargo clean
83+
- uses: actions/upload-artifact@v7
84+
with:
85+
name: Geometry-Rays-${{ inputs.version }}-macos-arm64
86+
path: Geometry-Rays-arm64
87+
- uses: actions/upload-artifact@v7
5688
with:
57-
name: Geometry-Rays-macos
58-
path: Geometry-Rays
89+
name: Geometry-Rays-${{ inputs.version }}-macos-x64
90+
path: Geometry-Rays-x64

.github/workflows/test-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212

1313
steps:
1414
- name: Checkout repository
15-
uses: actions/checkout@v4
15+
uses: actions/checkout@v6
1616

1717
- uses: actions-rust-lang/setup-rust-toolchain@v1
1818
with:

0 commit comments

Comments
 (0)