Skip to content

Commit 0e4b68d

Browse files
committed
potentially fix release build
1 parent 168f348 commit 0e4b68d

File tree

2 files changed

+12
-34
lines changed

2 files changed

+12
-34
lines changed

.github/workflows/release.yml

Lines changed: 11 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,9 @@ jobs:
2424
- uses: dtolnay/rust-toolchain@stable
2525
with:
2626
targets: x86_64-unknown-linux-gnu
27-
toolchain: 1.73.0
27+
toolchain: 1.81.0
2828

29-
- name: Set up JDK 17
30-
uses: actions/setup-java@v2
31-
with:
32-
java-version: '11'
33-
distribution: 'adopt'
29+
3430

3531
- name: install dependencies
3632
run: |
@@ -45,6 +41,7 @@ jobs:
4541
mkdir linux
4642
cp target/x86_64-unknown-linux-gnu/release/${{ env.binary }} linux/
4743
cp -r assets linux/
44+
cp -r scenarios linux/
4845
4946
- name: Package as a zip
5047
working-directory: ./linux
@@ -81,30 +78,18 @@ jobs:
8178
- uses: dtolnay/rust-toolchain@stable
8279
with:
8380
targets: x86_64-pc-windows-msvc
84-
toolchain: 1.73.0
85-
86-
- name: Set up JDK 17
87-
uses: actions/setup-java@v2
88-
with:
89-
java-version: '11'
90-
distribution: 'adopt'
81+
toolchain: 1.81.0
9182

9283
- name: Build
9384
run: |
9485
cargo build --release --target x86_64-pc-windows-msvc
95-
96-
- name: Build Horizon Ui
97-
run: |
98-
cd .\horizon-ui
99-
./gradlew obfuscate
100-
cd ..
10186
10287
- name: Prepare package
10388
run: |
10489
mkdir windows
10590
cp target/x86_64-pc-windows-msvc/release/${{ env.binary }}.exe windows/
10691
cp -r assets windows/
107-
cp .\horizon-ui\build\compose\jars\horizon-ui-windows-x64-1.0.0.min.jar windows/horizon-ui.jar
92+
cp -r scenarios windows/
10893
10994
- name: Package as a zip
11095
run: |
@@ -138,13 +123,8 @@ jobs:
138123
- uses: dtolnay/rust-toolchain@stable
139124
with:
140125
targets: x86_64-apple-darwin
141-
toolchain: 1.73.0
142-
143-
- name: Set up JDK 17
144-
uses: actions/setup-java@v2
145-
with:
146-
java-version: '11'
147-
distribution: 'adopt'
126+
toolchain: 1.81.0
127+
148128
- name: Environment Setup
149129
run: |
150130
export CFLAGS="-fno-stack-check"
@@ -159,6 +139,7 @@ jobs:
159139
mkdir -p ${{ env.binary }}.app/Contents/MacOS
160140
cp target/x86_64-apple-darwin/release/${{ env.binary }} ${{ env.binary }}.app/Contents/MacOS/
161141
cp -r assets ${{ env.binary }}.app/Contents/MacOS/
142+
cp -r scenarios ${{ env.binary }}.app/Contents/MacOS/
162143
hdiutil create -fs HFS+ -volname "${{ env.binary }}" -srcfolder ${{ env.binary }}.app ${{ env.binary }}-macOS-intel.dmg
163144
164145
- name: Upload binaries to artifacts
@@ -189,13 +170,9 @@ jobs:
189170
- uses: dtolnay/rust-toolchain@stable
190171
with:
191172
targets: aarch64-apple-darwin
192-
toolchain: 1.73.0
173+
toolchain: 1.81.0
174+
193175

194-
- name: Set up JDK 17
195-
uses: actions/setup-java@v2
196-
with:
197-
java-version: '11'
198-
distribution: 'adopt'
199176
- name: Environment
200177
# macOS 11 was the first version to support ARM
201178
run: |
@@ -210,6 +187,7 @@ jobs:
210187
mkdir -p ${{ env.binary }}.app/Contents/MacOS
211188
cp target/aarch64-apple-darwin/release/${{ env.binary }} ${{ env.binary }}.app/Contents/MacOS/
212189
cp -r assets ${{ env.binary }}.app/Contents/MacOS/
190+
cp -r scenarios ${{ env.binary }}.app/Contents/MacOS/
213191
hdiutil create -fs HFS+ -volname "${{ env.binary }}-macOS-apple-silicon" -srcfolder ${{ env.binary }}.app ${{ env.binary }}-macOS-apple-silicon.dmg
214192
215193
- name: Upload binaries to artifacts

.github/workflows/wasm._yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
- uses: dtolnay/rust-toolchain@stable
3232
with:
3333
targets: wasm32-unknown-unknown
34-
toolchain: 1.73.0
34+
toolchain: 1.81.0
3535
- name: install wasm-bindgen-cli
3636
run: |
3737
cargo install wasm-bindgen-cli --version 0.2.87

0 commit comments

Comments
 (0)