Skip to content

Commit

Permalink
deps: update some packages also use mise (rust 1.81 and node 22) (#316)
Browse files Browse the repository at this point in the history
* update dependencies and versions

* update dependencies and versions

* update dependencies and versions

* update dependencies and versions

* update dependencies and versions

* update dependencies and versions

* update dependencies and versions

* update dependencies and versions

* chore: bump version

* chore: bump version
  • Loading branch information
hcavarsan authored Sep 29, 2024
1 parent 32ef0bf commit b1dad1b
Show file tree
Hide file tree
Showing 23 changed files with 1,458 additions and 1,493 deletions.
23 changes: 6 additions & 17 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@ jobs:
uses: actions/checkout@v4

- name: Install pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 8.15.6
version: 9
run_install: |
- recursive: true
args: [--frozen-lockfile]
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: "21.7.1"
node-version: "22"
cache: "pnpm"

- name: Install pnpm dependencies
run: pnpm install --no-frozen-lockfile

- name: Perform linting
run: pnpm lint:front

Expand Down Expand Up @@ -76,17 +76,6 @@ jobs:
- name: Install Rust stable
uses: dtolnay/rust-toolchain@stable

- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: "21.7.1"

- name: Install pnpm
uses: pnpm/action-setup@v3
with:
version: 8.15.6
run_install: false

- name: Run Clippy
run: cargo clippy --workspace --all-targets --all-features -- -D warnings

Expand Down
48 changes: 28 additions & 20 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,21 @@ jobs:
uses: swatinem/rust-cache@v2

- name: Install pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 9.1.2
version: 9
run_install: |
- recursive: true
args: [--frozen-lockfile]
- name: Sync node version and setup cache
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: "lts/*"
node-version: "22"
cache: "pnpm"


- name: Cache pnpm modules
uses: actions/cache@v4
with:
Expand All @@ -92,9 +97,6 @@ jobs:
restore-keys: |
${{ runner.OS }}-pnpm-${{ runner.ARCH }}-
- name: Install dependencies
run: pnpm install --no-frozen-lockfile

- name: Set up Visual Studio shell
if: matrix.os == 'windows-latest' && matrix.arch == 'arm64'
uses: TheMrMilchmann/setup-msvc-dev@v3
Expand Down Expand Up @@ -147,20 +149,25 @@ jobs:
arch: arm64
runner: ubicloud-standard-4-arm
rust_target: aarch64-unknown-linux-gnu
os_name: linux
- os: ubuntu-latest
arch: amd64
rust_target: x86_64-unknown-linux-gnu
os_name: linux
- os: macos-latest
arch: universal
rust_target: universal-apple-darwin
os_name: macos
- os: windows-latest
arch: x86
rust_target: i686-pc-windows-msvc
msvc_arch: x86
os_name: windows
- os: windows-latest
arch: x86_64
rust_target: x86_64-pc-windows-msvc
msvc_arch: x64
os_name: windows

runs-on: ${{ matrix.runner || matrix.os }}

Expand All @@ -178,15 +185,19 @@ jobs:
- name: Cache Rust
uses: swatinem/rust-cache@v2


- name: Install pnpm
uses: pnpm/action-setup@v3
uses: pnpm/action-setup@v4
with:
version: 9.1.2
version: 9
run_install: |
- recursive: true
args: [--frozen-lockfile]
- name: Sync node version and setup cache
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version: "lts/*"
node-version: "22"
cache: "pnpm"

- name: Cache pnpm modules
Expand All @@ -199,9 +210,6 @@ jobs:
restore-keys: |
${{ runner.OS }}-pnpm-${{ runner.ARCH }}-
- name: Install dependencies
run: pnpm install --no-frozen-lockfile

- name: Setup platform-specific dependencies
if: matrix.os == 'ubuntu-latest'
run: |
Expand Down Expand Up @@ -263,13 +271,13 @@ jobs:
mv ./target/release/kftui ./target/release/kftui_macos_universal
gh release upload ${{ github.ref_name }} ./target/release/kftui_macos_universal --clobber
elif [ "${{ matrix.os }}" == "windows-latest" ]; then
mv ./target/${{ matrix.rust_target }}/release/kftui.exe ./target/release/kftui_${{ matrix.arch }}.exe
chmod +x ./target/release/kftui_${{ matrix.arch }}.exe
gh release upload ${{ github.ref_name }} ./target/release/kftui_${{ matrix.arch }}.exe --clobber
mv ./target/${{ matrix.rust_target }}/release/kftui.exe ./target/release/kftui_${{ matrix.os_name }}_${{ matrix.arch }}.exe
chmod +x ./target/release/kftui_${{ matrix.os_name }}_${{ matrix.arch }}.exe
gh release upload ${{ github.ref_name }} ./target/release/kftui_${{ matrix.os_name }}_${{ matrix.arch }}.exe
else
mv ./target/${{ matrix.rust_target }}/release/kftui ./target/release/kftui_${{ matrix.arch }}
chmod +x ./target/release/kftui_${{ matrix.arch }}
gh release upload ${{ github.ref_name }} ./target/release/kftui_${{ matrix.arch }} --clobber
mv ./target/${{ matrix.rust_target }}/release/kftui ./target/release/kftui_${{ matrix.os_name }}_${{ matrix.arch }}
chmod +x ./target/release/kftui_${{ matrix.os_name }}_${{ matrix.arch }}
gh release upload ${{ github.ref_name }} ./target/release/kftui_${{ matrix.os_name }}_${{ matrix.arch }}
fi
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ pnpm-debug.log*
lerna-debug.log*

node_modules
*/dist/assets/*
*/dist/assets/**
*.local

# Editor directories and files
Expand Down
3 changes: 3 additions & 0 deletions .mise.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[tools]
node = "22"
rust = "1.81"
Loading

0 comments on commit b1dad1b

Please sign in to comment.