Skip to content

chore: bump rust version to 1.83 #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Feb 7, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN yum -y install git

RUN yum -y install python3

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.81.0
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain 1.83.0

ENV PATH="/root/.cargo/bin:${PATH}"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/c-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79
toolchain: 1.83
override: true
components: clippy, rustfmt
- name: Build
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dotnet-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79
toolchain: 1.83
override: true
components: clippy, rustfmt
- name: Setup linux-aarch_64 rust target
Expand Down Expand Up @@ -124,7 +124,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79
toolchain: 1.83
override: true
components: clippy, rustfmt

Expand Down Expand Up @@ -176,4 +176,4 @@ jobs:
if: "startsWith(github.ref, 'refs/tags/')"
run: |
cd dotnet/KclLib/bin/Release
dotnet nuget push KclLib.0.11.0.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
dotnet nuget push KclLib.0.11.1.nupkg -k ${{ secrets.NUGET_API_KEY }} -s https://api.nuget.org/v3/index.json
18 changes: 9 additions & 9 deletions .github/workflows/java-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Install rust nightly toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79
toolchain: 1.83
override: true
components: clippy, rustfmt

Expand All @@ -83,7 +83,7 @@ jobs:
run: mvn clean package -DskipTests=true -Djni.classifier=${{ matrix.classifier }} -Dcargo-build.profile=release

- name: 'Upload artifact'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: kcl-lib-${{ matrix.classifier }}
path: |
Expand All @@ -103,39 +103,39 @@ jobs:
uses: actions/checkout@v3

- name: Download windows x86_64 lib
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kcl-lib-windows-x86_64
path: java/native

- name: Download linux aarch_64 lib
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kcl-lib-linux-aarch_64
path: java/native

- name: Download darwin x86_64 lib
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kcl-lib-osx-x86_64
path: java/native

- name: Download darwin aarch_64 lib
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kcl-lib-osx-aarch_64
path: java/native

- name: Run tests and package in CentOS 7 container
run: |
docker run --rm -v ${{ github.workspace }}/java:/work kcllang/kcl-java-builder-centos7:0.1.0 bash -c "
docker run --rm -v ${{ github.workspace }}/java:/work kcllang/kcl-java-builder-centos7:latest bash -c "
cd /work &&
rustup default stable &&
mvn package -DskipTests=true -Dcargo-build.profile=release
"

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: kcl-lib
path: java/target/*.jar
Expand All @@ -160,7 +160,7 @@ jobs:
settings-path: ${{ github.workspace }} # location for the settings.xml file

- name: Download Jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kcl-lib
path: java/release
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/kotlin-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Install rust nightly toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79
toolchain: 1.83
override: true
components: clippy, rustfmt

Expand All @@ -83,7 +83,7 @@ jobs:
run: mvn clean package -DskipTests=true -Djni.classifier=${{ matrix.classifier }} -Dcargo-build.profile=release

- name: 'Upload artifact'
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: kcl-lib-${{ matrix.classifier }}
path: |
Expand All @@ -103,39 +103,39 @@ jobs:
uses: actions/checkout@v3

- name: Download windows x86_64 lib
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kcl-lib-windows-x86_64
path: kotlin/native

- name: Download linux aarch_64 lib
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kcl-lib-linux-aarch_64
path: kotlin/native

- name: Download darwin x86_64 lib
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kcl-lib-osx-x86_64
path: kotlin/native

- name: Download darwin aarch_64 lib
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kcl-lib-osx-aarch_64
path: kotlin/native

- name: Run tests and package in CentOS 7 container
run: |
docker run --rm -v ${{ github.workspace }}/kotlin:/work kcllang/kcl-java-builder-centos7:0.1.0 bash -c "
docker run --rm -v ${{ github.workspace }}/kotlin:/work kcllang/kcl-java-builder-centos7:latest bash -c "
cd /work &&
rustup default stable &&
mvn package -DskipTests=true -Dcargo-build.profile=release
"

- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: kcl-lib
path: kotlin/target/*.jar
Expand All @@ -160,7 +160,7 @@ jobs:
settings-path: ${{ github.workspace }} # location for the settings.xml file

- name: Download Jar
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: kcl-lib
path: kotlin/release
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lua-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79
toolchain: 1.83
override: true
components: clippy, rustfmt
- name: Build
Expand Down
13 changes: 7 additions & 6 deletions .github/workflows/nodejs-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
-e NAPI_TARGET=x86_64-unknown-linux-gnu \
-w /build/nodejs \
ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian \
bash -c "pnpm build"
bash -c "corepack prepare [email protected] --activate && pnpm build"
cd nodejs
# change owner to current user
sudo chown -R 1001:121 *.node
Expand All @@ -86,7 +86,8 @@ jobs:
-w /build/nodejs \
ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64 \
bash -c "set -e &&
rustup target add aarch64-unknown-linux-gnu &&
rustup target add aarch64-unknown-linux-gnu &&
corepack prepare [email protected] --activate &&
pnpm build --target aarch64-unknown-linux-gnu &&
aarch64-unknown-linux-gnu-strip *.node"
cd nodejs
Expand Down Expand Up @@ -117,7 +118,7 @@ jobs:
shell: bash
working-directory: .
run: ${{ matrix.settings.build }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: bindings-linux-${{ matrix.settings.target }}
path: nodejs/*.node
Expand Down Expand Up @@ -157,7 +158,7 @@ jobs:
- name: Build
shell: bash
run: ${{ matrix.settings.build }}
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: bindings-windows-${{ matrix.settings.target }}
path: nodejs/*.node
Expand Down Expand Up @@ -207,7 +208,7 @@ jobs:
- name: Build
run: ${{ matrix.settings.build }}
shell: bash
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: bindings-macos-${{ matrix.settings.target }}
path: nodejs/*.node
Expand Down Expand Up @@ -240,7 +241,7 @@ jobs:
run: pnpm install --no-save --frozen-lockfile

- name: Download all artifacts
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
path: nodejs/artifacts
- name: Move artifacts
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/python-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ jobs:
command: sdist
args: -o dist
- name: Upload sdist
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: wheels
name: sdist-${{ github.run_id }}
path: python/dist

linux:
Expand All @@ -59,10 +59,10 @@ jobs:
env:
# Workaround ring 0.17 build issue
CFLAGS_aarch64_unknown_linux_gnu: "-D__ARM_ARCH=8"
- name: Upload wheels
uses: actions/upload-artifact@v3
- name: Upload wheels-${{ matrix.target }}-${{ github.run_id }}
uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-ubuntu-${{ matrix.target }}-${{ github.run_id }}
path: python/dist

windows:
Expand All @@ -74,10 +74,10 @@ jobs:
working-directory: "python"
command: build
args: --release -o dist --find-interpreter
- name: Upload wheels
uses: actions/upload-artifact@v3
- name: Upload wheels-windows-${{ github.run_id }}
uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-windows-${{ github.run_id }}
path: python/dist

macos:
Expand All @@ -90,10 +90,10 @@ jobs:
command: build
target: universal2-apple-darwin
args: --release -o dist --find-interpreter
- name: Upload wheels
uses: actions/upload-artifact@v3
- name: Upload wheels-macos-${{ github.run_id }}
uses: actions/upload-artifact@v4
with:
name: wheels
name: wheels-macos-${{ github.run_id }}
path: python/dist

release:
Expand All @@ -105,9 +105,9 @@ jobs:
id-token: write
needs: [ macos, linux, windows ]
steps:
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: wheels
name: wheels-${{ github.run_id }}
path: python/dist
- name: Publish to PyPI
# The issue https://github.com/pypa/gh-action-pypi-publish/issues/310 has not tagged a release yet
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rust-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
- name: Install rust nightly toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79
toolchain: 1.83
override: true
components: clippy, rustfmt
- name: Rust code test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/swift-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
toolchain: 1.79
toolchain: 1.83
override: true
components: clippy, rustfmt
- name: Setup Swift toolchain
Expand Down
Loading
Loading