Skip to content

Commit 108528a

Browse files
committed
Merge branch 'feature/ci' into development
2 parents d937e16 + f33329a commit 108528a

File tree

6 files changed

+17
-31
lines changed

6 files changed

+17
-31
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@ jobs:
2424
- name: Create .env file
2525
run: |
2626
touch .env
27-
echo CLI_CLIENT_ID=${{ secrets.CLI_CLIENT_ID }} >> .env
28-
echo SIGIT_CLIENT_ID=${{ secrets.SIGIT_CLIENT_ID }} >> .env
29-
echo WEB_CONSOLE_CLIENT_ID=${{ secrets.WEB_CONSOLE_CLIENT_ID }} >> .env
3027
echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
31-
echo SIGIT_CLIENT_SECRET=${{ secrets.SIGIT_CLIENT_SECRET }} >> .env
32-
echo WEB_CONSOLE_CLIENT_SECRET=${{ secrets.WEB_CONSOLE_CLIENT_SECRET }} >> .env
3328
cat .env
3429
3530
- run: cargo test --all-features

.github/workflows/release-crate.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,7 @@ jobs:
2828
- name: Create .env file
2929
run: |
3030
touch .env
31-
echo CLI_CLIENT_ID=${{ secrets.CLI_CLIENT_ID }} >> .env
32-
echo SIGIT_CLIENT_ID=${{ secrets.SIGIT_CLIENT_ID }} >> .env
33-
echo WEB_CONSOLE_CLIENT_ID=${{ secrets.WEB_CONSOLE_CLIENT_ID }} >> .env
3431
echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
35-
echo SIGIT_CLIENT_SECRET=${{ secrets.SIGIT_CLIENT_SECRET }} >> .env
36-
echo WEB_CONSOLE_CLIENT_SECRET=${{ secrets.WEB_CONSOLE_CLIENT_SECRET }} >> .env
3732
cat .env
3833
3934
- name: Publish to crates.io

.github/workflows/release-github.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,15 @@ on:
44
push:
55
tags:
66
- "v*.*.*"
7+
workflow_dispatch:
78

89
env:
910
# The smbcloud-cli binary name
1011
PROJECT_NAME: smb
12+
1113
permissions:
1214
contents: write
15+
1316
jobs:
1417
build:
1518
runs-on: ${{ matrix.runner }}
@@ -37,7 +40,7 @@ jobs:
3740
- name: Install Rust
3841
uses: dtolnay/rust-toolchain@stable
3942
with:
40-
toolchain: 1.87
43+
toolchain: 1.92
4144
targets: "${{ matrix.target }}"
4245

4346
#- name: Install OpenSSL
@@ -50,12 +53,7 @@ jobs:
5053
- name: Create .env file
5154
run: |
5255
touch .env
53-
echo CLI_CLIENT_ID=${{ secrets.CLI_CLIENT_ID }} >> .env
54-
echo SIGIT_CLIENT_ID=${{ secrets.SIGIT_CLIENT_ID }} >> .env
55-
echo WEB_CONSOLE_CLIENT_ID=${{ secrets.WEB_CONSOLE_CLIENT_ID }} >> .env
5656
echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
57-
echo SIGIT_CLIENT_SECRET=${{ secrets.SIGIT_CLIENT_SECRET }} >> .env
58-
echo WEB_CONSOLE_CLIENT_SECRET=${{ secrets.WEB_CONSOLE_CLIENT_SECRET }} >> .env
5957
cat .env
6058
6159
- name: Build Binary
@@ -81,6 +79,7 @@ jobs:
8179
8280
mkdir -p "${DEST_DIR}"
8381
mv "${BIN_OUTPUT}" "${DEST_DIR}/${BIN_RELEASE}"
82+
8483
- name: Release
8584
uses: softprops/action-gh-release@v2
8685
if: github.ref_type == 'tag'

.github/workflows/release-npm.yml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
tags:
66
- "v*.*.*"
7+
workflow_dispatch:
78

89
env:
910
SMB_CLIENT_ID: ${{ secrets.SMB_CLIENT_ID }}
@@ -26,7 +27,7 @@ jobs:
2627
- {
2728
NAME: linux-x64-glibc,
2829
OS: ubuntu-20.04,
29-
TOOLCHAIN: 1.87,
30+
TOOLCHAIN: 1.92,
3031
TARGET: x86_64-unknown-linux-gnu,
3132
}
3233
# Cannot cross-compile for now
@@ -39,25 +40,25 @@ jobs:
3940
- {
4041
NAME: win32-x64-msvc,
4142
OS: windows-2022,
42-
TOOLCHAIN: 1.87,
43+
TOOLCHAIN: 1.92,
4344
TARGET: x86_64-pc-windows-msvc,
4445
}
4546
- {
4647
NAME: win32-arm64-msvc,
4748
OS: windows-2022,
48-
TOOLCHAIN: 1.87,
49+
TOOLCHAIN: 1.92,
4950
TARGET: aarch64-pc-windows-msvc,
5051
}
5152
- {
5253
NAME: darwin-x64,
5354
OS: macos-11,
54-
TOOLCHAIN: 1.87,
55+
TOOLCHAIN: 1.92,
5556
TARGET: x86_64-apple-darwin,
5657
}
5758
- {
5859
NAME: darwin-arm64,
5960
OS: macos-11,
60-
TOOLCHAIN: 1.87,
61+
TOOLCHAIN: 1.92,
6162
TARGET: aarch64-apple-darwin,
6263
}
6364
steps:
@@ -77,12 +78,7 @@ jobs:
7778
- name: Create .env file
7879
run: |
7980
touch .env
80-
echo CLI_CLIENT_ID=${{ secrets.CLI_CLIENT_ID }} >> .env
81-
echo SIGIT_CLIENT_ID=${{ secrets.SIGIT_CLIENT_ID }} >> .env
82-
echo WEB_CONSOLE_CLIENT_ID=${{ secrets.WEB_CONSOLE_CLIENT_ID }} >> .env
8381
echo CLI_CLIENT_SECRET=${{ secrets.CLI_CLIENT_SECRET }} >> .env
84-
echo SIGIT_CLIENT_SECRET=${{ secrets.SIGIT_CLIENT_SECRET }} >> .env
85-
echo WEB_CONSOLE_CLIENT_SECRET=${{ secrets.WEB_CONSOLE_CLIENT_SECRET }} >> .env
8682
cat .env
8783
8884
- name: Build
@@ -95,9 +91,9 @@ jobs:
9591
cargo build --release --locked --target ${{ matrix.build.TARGET }}
9692
9793
- name: Install node
98-
uses: actions/setup-node@v3
94+
uses: actions/setup-node@v6
9995
with:
100-
node-version: "18"
96+
node-version-file: .nvmrc
10197
registry-url: "https://registry.npmjs.org"
10298

10399
- name: Publish to NPM
@@ -158,9 +154,9 @@ jobs:
158154
run: echo "RELEASE_VERSION=${GITHUB_REF:11}" >> $GITHUB_ENV
159155

160156
- name: Install node
161-
uses: actions/setup-node@v3
157+
uses: actions/setup-node@v6
162158
with:
163-
node-version: "18"
159+
node-version-file: .nvmrc
164160
registry-url: "https://registry.npmjs.org"
165161

166162
- name: Publish the package

.nvmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v24.12.0

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[toolchain]
2-
channel = "1.91"
2+
channel = "1.92"

0 commit comments

Comments
 (0)