From af16f09a2788c9400a6e40d27d1b820f6d67b1ad Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Tue, 26 Sep 2023 09:50:10 +0300 Subject: [PATCH 1/4] bump rustc version --- .github/workflows/build_publish_tools_container.yml | 5 ++++- tools_container/Dockerfile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_publish_tools_container.yml b/.github/workflows/build_publish_tools_container.yml index a531964..bdec418 100644 --- a/.github/workflows/build_publish_tools_container.yml +++ b/.github/workflows/build_publish_tools_container.yml @@ -5,7 +5,10 @@ on: paths: - tools_container branches: - - 'master' + - 'main' + pull_request: + branches: + - 'main' release: types: [published] tags: diff --git a/tools_container/Dockerfile b/tools_container/Dockerfile index db665ab..f3c3b24 100644 --- a/tools_container/Dockerfile +++ b/tools_container/Dockerfile @@ -1,5 +1,5 @@ # Container image that runs your code -FROM rust:1.67-slim as build +FROM rust:1.71-slim as build # Install nightly so we can use it to build rustdocs index pages RUN rustup toolchain install nightly \ From 2fea308cd048d46a2b45b9c803a1bff666272514 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Tue, 26 Sep 2023 09:51:07 +0300 Subject: [PATCH 2/4] test --- .github/workflows/build_publish_tools_container.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_publish_tools_container.yml b/.github/workflows/build_publish_tools_container.yml index bdec418..c0f5283 100644 --- a/.github/workflows/build_publish_tools_container.yml +++ b/.github/workflows/build_publish_tools_container.yml @@ -46,6 +46,6 @@ jobs: uses: docker/build-push-action@v3.2.0 with: context: tools_container - push: true + push: false tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file From d45e609316dcae06c541183acaf34843d0febb4e Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Tue, 26 Sep 2023 10:15:19 +0300 Subject: [PATCH 3/4] fix --- tools_container/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools_container/Dockerfile b/tools_container/Dockerfile index f3c3b24..a00946b 100644 --- a/tools_container/Dockerfile +++ b/tools_container/Dockerfile @@ -29,7 +29,7 @@ ARG MDBOOK_THEME_VERSION="0.1.2" ARG CARGO_SPELLCHECK_VERSION="0.12.3" ARG CARGO_DEPGRAPH="1.4.0" ARG CARGO_REFINERY_CLI="0.8.7" -ARG CARGO_REFINERY_CLI="0.21.1" +ARG CARGO_UNIFFI_BINDGEN="0.21.1" ENV CARGO_INSTALL_ROOT /usr/local/ ENV CARGO_TARGET_DIR /tmp/target/ From d2bc3ef00614f055a38afa3fb15832800cddf329 Mon Sep 17 00:00:00 2001 From: Mr-Leshiy Date: Tue, 26 Sep 2023 10:45:49 +0300 Subject: [PATCH 4/4] cleanup --- .github/workflows/build_publish_tools_container.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build_publish_tools_container.yml b/.github/workflows/build_publish_tools_container.yml index c0f5283..3b9327c 100644 --- a/.github/workflows/build_publish_tools_container.yml +++ b/.github/workflows/build_publish_tools_container.yml @@ -6,9 +6,6 @@ on: - tools_container branches: - 'main' - pull_request: - branches: - - 'main' release: types: [published] tags: @@ -46,6 +43,6 @@ jobs: uses: docker/build-push-action@v3.2.0 with: context: tools_container - push: false + push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} \ No newline at end of file