Skip to content
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 .github/workflows/ci-extension.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ on:

env:
NODEJS_VERSION: 18.x
RUST_VERSION: 1.73
RUST_VERSION: 1.85

jobs:

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
workflow_dispatch: # allows manual trigger

env:
RUST_VERSION: 1.86
RUST_VERSION: 1.85

jobs:
"lint_fmt":
Expand Down
22 changes: 14 additions & 8 deletions .github/workflows/release-reproducible-smart-contract.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ on:
env:
REGISTRY: docker.io
SERVICE_NAME: 'verifiable-sc'
RUST_VERSION: 1.86.0

jobs:
build-and-push-image:
Expand All @@ -22,22 +21,27 @@ jobs:
with:
submodules: recursive
- name: Extract version from git tag
id: meta
env:
TAG: ${{ github.ref_name }}
run: |
# Extract version by splitting on "/" and taking the second part
TAG_VERSION=$(echo "$TAG" | cut -d '/' -f2)
if [ "$TAG_VERSION" != "$RUST_VERSION" ]; then
echo "Tag version does not match the declared rust version."
exit 1
fi
RUST_VERSION=$(echo "$TAG" | cut -d '/' -f2)
echo "$RUST_VERSION"
echo "$TAG"
echo "rust_version=$RUST_VERSION" > "$GITHUB_OUTPUT"
- uses: actions-rust-lang/setup-rust-toolchain@v1

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you can get rid of this action and just use cargo +${{ env.RUST_VERSION }} it will also be nice. We have had some issues with this action, so we are moving to not using any of these actions but just relying on rustup that is installed on the runner.

with:
toolchain: ${{ env.RUST_VERSION }}
toolchain: ${{ steps.meta.outputs.rust_version }}
target: wasm32-unknown-unknown
- run: docker build -f ./reproducible/build.Dockerfile --build-arg source_image="rust:$RUST_VERSION" -t "concordium/$SERVICE_NAME:$RUST_VERSION" ./reproducible
- name: Build Docker image
env:
RUST_VERSION: ${{ steps.meta.outputs.rust_version }}
run: docker build -f ./reproducible/build.Dockerfile --build-arg source_image="rust:$RUST_VERSION" -t "concordium/$SERVICE_NAME:$RUST_VERSION" ./reproducible
- name: Test smart contract
working-directory: ./reproducible/example-contract
env:
RUST_VERSION: ${{ steps.meta.outputs.rust_version }}
run: |
CARGO_CONCORDIUM="cargo run --manifest-path $GITHUB_WORKSPACE/cargo-concordium/Cargo.toml --target x86_64-unknown-linux-gnu -- concordium"
$CARGO_CONCORDIUM build --verifiable "concordium/$SERVICE_NAME:$RUST_VERSION"
Expand All @@ -49,4 +53,6 @@ jobs:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Push the image
env:
RUST_VERSION: ${{ steps.meta.outputs.rust_version }}
run: docker push "concordium/$SERVICE_NAME:$RUST_VERSION"
1 change: 1 addition & 0 deletions vscode-smart-contracts/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ node_modules
.vscode-test/
*.vsix
executables

Loading