Skip to content

Commit 0fc1554

Browse files
committed
Merge branch 'main' into apps
2 parents 07018fa + eb5a9ed commit 0fc1554

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+5118
-1255
lines changed

.github/workflows/release.yml

Lines changed: 132 additions & 71 deletions
Large diffs are not rendered by default.

.github/workflows/rustfmt.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@ on:
66
pull_request:
77
workflow_dispatch:
88

9+
# https://github.com/reviewdog/action-suggester?tab=readme-ov-file#required-permissions
10+
permissions:
11+
contents: read
12+
checks: write
13+
issues: write
14+
pull-requests: write
15+
916
jobs:
1017
rustfmt:
1118
name: Rustfmt Check
@@ -18,4 +25,14 @@ jobs:
1825
with:
1926
components: rustfmt
2027
- name: Rustfmt check
28+
if: ${{ github.event_name != 'pull_request' }}
2129
run: cargo fmt -- --check -v
30+
- name: Rustfmt PR
31+
if: ${{ github.event_name == 'pull_request' }}
32+
run: cargo fmt -- -v
33+
- name: Suggest format changes
34+
if: ${{ github.event_name == 'pull_request' }}
35+
uses: reviewdog/action-suggester@v1
36+
with:
37+
tool_name: rustfmt
38+
fail_on_error: true

.github/workflows/test.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ jobs:
2525
x86_64-apple-darwin,
2626
x86_64-unknown-linux-gnu,
2727
x86_64-unknown-linux-musl,
28+
x86_64-unknown-freebsd,
2829
i686-pc-windows-msvc-windowsstore,
2930
i686-pc-windows-msvc-windowsappinstaller,
3031
i686-pc-windows-gnu-msi,
@@ -70,6 +71,11 @@ jobs:
7071
os: ubuntu
7172
features: selfupdate,binjuliainstaller,binjulialauncher
7273
rustflags: -C target-feature=+crt-static
74+
- label: x86_64-unknown-freebsd
75+
target: x86_64-unknown-freebsd
76+
os: ubuntu
77+
features: selfupdate,binjuliainstaller,binjulialauncher
78+
rustflags:
7379
- label: i686-pc-windows-msvc-windowsstore
7480
target: i686-pc-windows-msvc
7581
os: windows
@@ -134,6 +140,7 @@ jobs:
134140
x86_64-apple-darwin,
135141
x86_64-unknown-linux-gnu,
136142
x86_64-unknown-linux-musl,
143+
x86_64-unknown-freebsd,
137144
i686-pc-windows-msvc,
138145
i686-pc-windows-gnu,
139146
]
@@ -163,6 +170,11 @@ jobs:
163170
features: dummy,binjulialauncher
164171
rustflags: -C target-feature=+crt-static
165172
toolchain: stable
173+
- target: x86_64-unknown-freebsd
174+
os: ubuntu
175+
features: dummy,binjulialauncher
176+
rustflags:
177+
toolchain: stable
166178
- target: i686-pc-windows-msvc
167179
os: windows
168180
features: dummy,binjulialauncher
@@ -183,12 +195,29 @@ jobs:
183195
platform: x86
184196
version: 12.2.0
185197
- uses: actions-rust-lang/setup-rust-toolchain@v1
198+
if: ${{ ! contains(matrix.target, 'freebsd') }}
186199
with:
187200
toolchain: ${{matrix.toolchain}}
188201
target: ${{matrix.target}}
189202
- name: Test
203+
if: ${{ ! contains(matrix.target, 'freebsd') }}
190204
run: cargo test --target ${{matrix.target}} --features ${{matrix.features}}
191205
env:
192206
CARGO_TARGET_x86_64-unknown-linux-musl: ${{matrix.rustflags}}
193207
CARGO_TARGET_i686-unknown-linux-musl: ${{matrix.rustflags}}
194208
CARGO_TARGET_aarch64-unknown-linux-musl: ${{matrix.rustflags}}
209+
- name: Test FreeBSD
210+
if: ${{ contains(matrix.target, 'freebsd') }}
211+
uses: vmactions/freebsd-vm@v1
212+
with:
213+
release: "13.4"
214+
usesh: true
215+
mem: 8192
216+
copyback: false
217+
prepare: |
218+
pkg install -y curl
219+
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain ${{matrix.toolchain}}
220+
run: |
221+
. "${HOME}/.cargo/env"
222+
export RUST_BACKTRACE=full
223+
cargo test --target ${{matrix.target}} --features ${{matrix.features}}

.github/workflows/updateversiondb.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
mv scriptoutputfolder/versiondbbuild/* versiondb
6262
rm -rf scriptoutputfolder
6363
- name: Create Pull Request
64-
uses: peter-evans/create-pull-request@v5
64+
uses: peter-evans/create-pull-request@v7
6565
with:
6666
token: ${{ secrets.GITHUB_TOKEN }}
6767
commit-message: Update version db

0 commit comments

Comments
 (0)