Skip to content

Commit 34f0f33

Browse files
committed
Add more runs-on
1 parent 4a18fd6 commit 34f0f33

File tree

1 file changed

+15
-25
lines changed

1 file changed

+15
-25
lines changed

.github/workflows/rust.yml

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,19 @@ on: [push, pull_request]
44

55
jobs:
66
binaries:
7-
name: Build Binaries
7+
runs-on: ubuntu-latest
88
strategy:
99
matrix:
1010
target: [thumbv6m-none-eabi, thumbv7em-none-eabi, thumbv8m.main-none-eabi]
1111
start_address: [0x0802_0000, 0x1002_0000]
1212
steps:
13-
- name: Checkout
14-
uses: actions/checkout@v4
13+
- uses: actions/checkout@v4
1514
with:
1615
submodules: true
1716
- run: |
1817
rustup target add ${{ matrix.target }}
1918
cargo nbuild binaries --target=${{ matrix.target }} --start-address=${{ matrix.start_address }}
20-
- name: Upload Artifacts
21-
uses: actions/upload-artifact@v4
19+
- uses: actions/upload-artifact@v4
2220
if: ${{success()}}
2321
with:
2422
name: ${{ matrix.target }}-${{ matrix.start_address }}-binaries
@@ -28,14 +26,11 @@ jobs:
2826
linux-libraries:
2927
runs-on: ubuntu-latest
3028
steps:
31-
- name: Checkout
32-
uses: actions/checkout@v4
29+
- uses: actions/checkout@v4
3330
with:
3431
submodules: true
35-
- name: Build
36-
run: cargo nbuild libraries
37-
- name: Upload Artifacts
38-
uses: actions/upload-artifact@v4
32+
- run: cargo nbuild libraries
33+
- uses: actions/upload-artifact@v4
3934
if: ${{success()}}
4035
with:
4136
name: linux-libraries
@@ -45,40 +40,35 @@ jobs:
4540
windows-libraries:
4641
runs-on: windows-latest
4742
steps:
48-
- name: Checkout
49-
uses: actions/checkout@v4
43+
- uses: actions/checkout@v4
5044
with:
5145
submodules: true
52-
- name: Build
53-
run: cargo nbuild libraries
54-
- name: Upload Artifacts
55-
uses: actions/upload-artifact@v4
46+
- run: cargo nbuild libraries
47+
- uses: actions/upload-artifact@v4
5648
if: ${{success()}}
5749
with:
5850
name: windows-libraries
5951
if-no-files-found: error
6052
path: |
6153
./target/release/neotron_os.dll
6254
run-tests:
55+
runs-on: ubuntu-latest
6356
steps:
6457
- uses: actions/checkout@v4
6558
with:
6659
submodules: true
6760
- run: cargo nbuild test
6861
release:
69-
name: Upload Release
70-
needs: [binaries, linux-libraries, windows-libraries]
62+
runs-on: ubuntu-latest
63+
needs: [binaries, linux-libraries, windows-libraries, run-tests]
7164
if: github.event_name == 'push' && startswith(github.ref, 'refs/tags/')
7265
steps:
73-
- name: Make release area
74-
run: |
66+
- run: |
7567
mkdir ./release
76-
- name: Download Artifacts
77-
uses: actions/download-artifact@v4
68+
- uses: actions/download-artifact@v4
7869
with:
7970
path: ./release
80-
- name: Upload files to Release
81-
uses: softprops/action-gh-release@v1
71+
- uses: softprops/action-gh-release@v1
8272
with:
8373
files: |
8474
./release/*

0 commit comments

Comments
 (0)