Skip to content

Commit 1d5a3a1

Browse files
committed
Merge main into scottjasso/universal
2 parents 39d0e2f + eacff22 commit 1d5a3a1

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

+467
-581
lines changed

.github/workflows/api-docs.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@ jobs:
1515
with:
1616
persist-credentials: false
1717
- name: Set up cargo
18-
uses: dtolnay/rust-toolchain@master
19-
with:
20-
toolchain: 1.63
18+
uses: actions-rust-lang/setup-rust-toolchain@v1
2119
- name: Cargo Cache
2220
uses: Swatinem/rust-cache@v2
2321
- name: Build docs

.github/workflows/release.yml

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,8 @@ jobs:
4141
- name: Check out code
4242
uses: actions/checkout@v3
4343
- name: Set up cargo
44-
uses: dtolnay/rust-toolchain@master
44+
uses: actions-rust-lang/setup-rust-toolchain@v1
4545
with:
46-
toolchain: 1.63
4746
targets: aarch64-apple-darwin,x86_64-apple-darwin
4847
- name: Cargo Cache
4948
uses: Swatinem/rust-cache@v2
@@ -62,34 +61,14 @@ jobs:
6261
- name: Check out code
6362
uses: actions/checkout@v3
6463
- name: Set up cargo
65-
uses: dtolnay/rust-toolchain@master
66-
with:
67-
toolchain: 1.63
64+
uses: actions-rust-lang/setup-rust-toolchain@v1
6865
- name: Cargo Cache
6966
uses: Swatinem/rust-cache@v2
7067
- name: Add cargo-wix subcommand
7168
run: cargo install cargo-wix
7269
- name: Compile and package installer
7370
run: |
7471
cargo wix --nocapture --package volta --output target\wix\volta-windows.msi
75-
- name: Load Certificate File
76-
id: certificate_file
77-
if: github.event_name == 'push'
78-
uses: timheuer/base64-to-file@v1
79-
with:
80-
fileName: "volta-certificate.pfx"
81-
encodedString: ${{ secrets.INSTALLER_CERTIFICATE }}
82-
- name: Sign Installer
83-
if: github.event_name == 'push'
84-
env:
85-
CERTIFICATE_FILE: ${{ steps.certificate_file.outputs.filePath }}
86-
CERTIFICATE_PASSWORD: ${{ secrets.INSTALLER_CERTIFICATE_PASSWORD }}
87-
run: |
88-
& "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\signtool.exe" sign /fd sha256 /f "$env:CERTIFICATE_FILE" /p "$env:CERTIFICATE_PASSWORD" /tr http://ts.ssl.com /td sha256 /d "Volta: Start Your Engines" /du "https://volta.sh" "target\wix\volta-windows.msi"
89-
- name: Verify Signature
90-
if: github.event_name == 'push'
91-
run: |
92-
& "C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86\signtool.exe" verify /pa "target\wix\volta-windows.msi"
9372
- name: Create zip of binaries
9473
run: powershell Compress-Archive volta*.exe volta-windows.zip
9574
working-directory: ./target/release

.github/workflows/test.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,7 @@ jobs:
2424
- name: Check out code
2525
uses: actions/checkout@v3
2626
- name: Set up cargo
27-
uses: dtolnay/rust-toolchain@master
28-
with:
29-
toolchain: 1.63
30-
components: clippy
27+
uses: actions-rust-lang/setup-rust-toolchain@v1
3128
- name: Cargo Cache
3229
uses: Swatinem/rust-cache@v2
3330
- name: Run tests
@@ -48,9 +45,7 @@ jobs:
4845
- name: Check out code
4946
uses: actions/checkout@v3
5047
- name: Set up cargo
51-
uses: dtolnay/rust-toolchain@master
52-
with:
53-
toolchain: 1.63
48+
uses: actions-rust-lang/setup-rust-toolchain@v1
5449
- name: Cargo Cache
5550
uses: Swatinem/rust-cache@v2
5651
- name: Run tests
@@ -75,10 +70,7 @@ jobs:
7570
- name: Check out code
7671
uses: actions/checkout@v3
7772
- name: Set up cargo
78-
uses: dtolnay/rust-toolchain@master
79-
with:
80-
toolchain: 1.63
81-
components: rustfmt
73+
uses: actions-rust-lang/setup-rust-toolchain@v1
8274
- name: Cargo Cache
8375
uses: Swatinem/rust-cache@v2
8476
- name: Run check

0 commit comments

Comments
 (0)