Skip to content

Commit f536880

Browse files
oopsbagelcooperq
authored andcommitted
ci: minor syntax and workflow order fixes
1 parent bd2e0b4 commit f536880

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

.github/workflows/main.yml

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Check, test, build release zip, publish docs
1+
name: main
22

33
on:
44
push:
@@ -100,6 +100,8 @@ jobs:
100100
runs-on: ubuntu-latest
101101
permissions:
102102
contents: read
103+
env:
104+
NO_FIRMWARE_BIN=true
103105
steps:
104106
- uses: actions/checkout@v4
105107
- name: Check formatting
@@ -110,32 +112,34 @@ jobs:
110112
npm install
111113
npm run build
112114
popd
113-
NO_FIRMWARE_BIN=true cargo check --verbose --no-default-features --features=${{ matrix.device.name }}
115+
cargo check --verbose --no-default-features --features=${{ matrix.device.name }}
114116
- name: Run tests
115117
run: |
116-
NO_FIRMWARE_BIN=true cargo test --verbose --no-default-features --features=${{ matrix.device.name }}
118+
cargo test --verbose --no-default-features --features=${{ matrix.device.name }}
117119
- name: Run clippy
118120
run: |
119-
NO_FIRMWARE_BIN=true cargo clippy --verbose --no-default-features --features=${{ matrix.device.name }}
121+
cargo clippy --verbose --no-default-features --features=${{ matrix.device.name }}
120122
121123
windows_installer_check_and_test:
122124
needs: files_changed
123125
if: needs.files_changed.outputs.installer_changed != '0'
124126
runs-on: windows-latest
125127
permissions:
126128
contents: read
129+
env:
130+
NO_FIRMWARE_BIN=true
127131
steps:
128132
- uses: actions/checkout@v4
129133
- name: cargo check
130134
shell: bash
131135
run: |
132136
cd installer
133-
NO_FIRMWARE_BIN=true cargo check --verbose
137+
cargo check --verbose
134138
- name: cargo test
135139
shell: bash
136140
run: |
137141
cd installer
138-
NO_FIRMWARE_BIN=true cargo test --verbose --no-default-features
142+
cargo test --verbose --no-default-features
139143
140144
build_rayhunter_check:
141145
if: needs.files_changed.outputs.daemon_changed != '0'
@@ -242,6 +246,7 @@ jobs:
242246
packages: write
243247
needs:
244248
- build_rayhunter
249+
- build_rootshell
245250
- files_changed
246251
- windows_installer_check_and_test
247252
strategy:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
- uses: actions/checkout@v4
1717
- name: Ensure all Cargo.toml files have the same version defined.
1818
run: |
19-
defined_versions=$(find lib bin installer rootshell telcom-parser -name Cargo.toml -exec grep ^version {} \; | uniq | wc -l)
19+
defined_versions=$(find lib bin installer rootshell telcom-parser -name Cargo.toml -exec grep ^version {} \; | sort -u | wc -l)
2020
find lib bin installer rootshell telcom-parser -name Cargo.toml -exec grep ^version {} \;
2121
echo number of defined versions = $defined_versions
2222
if [ $defined_versions != "1" ]

0 commit comments

Comments
 (0)