From 42b897da07bccee6e6b22a38cd26376649b97f4d Mon Sep 17 00:00:00 2001 From: Javier Arias Date: Wed, 18 Oct 2023 11:36:10 +0100 Subject: [PATCH 1/2] Update changelog --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 53a9c9bb..643e6f4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] + - Upgrade rust to `1.73.0` in production and development `Dockerfile` + - Upgrade build dependencies (npm `v10.2.0`, node `v18.18.2`, n `v9.2.0` and rollup `v4.1.4`) in production and development `Dockerfile` ## [[0.11.7]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.7) - 2023-10-02 ### Changed From 035e2367adb29e009dd1a9127ecc5d50814754c6 Mon Sep 17 00:00:00 2001 From: Javier Arias Date: Wed, 18 Oct 2023 11:36:23 +0100 Subject: [PATCH 2/2] Upgrade rust 1.73.0 --- .github/workflows/build_test_and_check.yml | 12 ++++++------ .github/workflows/run_migrations.yml | 4 ++-- Dockerfile | 12 ++++++------ Dockerfile.dev | 10 +++++----- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build_test_and_check.yml b/.github/workflows/build_test_and_check.yml index 8db19f40..b001b14c 100644 --- a/.github/workflows/build_test_and_check.yml +++ b/.github/workflows/build_test_and_check.yml @@ -35,7 +35,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.17.1' + node-version: '18.18.2' - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -43,7 +43,7 @@ jobs: with: version: 'v0.12.1' - name: Install rollup - run: sudo npm install -g rollup@3.28.1 + run: sudo npm install -g rollup@4.1.4 - name: Compile WASM run: wasm-pack build thoth-app/ --target web --release - name: Pack APP @@ -59,7 +59,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.17.1' + node-version: '18.18.2' - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -67,7 +67,7 @@ jobs: with: version: 'v0.12.1' - name: Install rollup - run: sudo npm install -g rollup@3.28.1 + run: sudo npm install -g rollup@4.1.4 - name: Compile WASM run: wasm-pack build thoth-app/ --target web --release - name: Pack APP @@ -88,7 +88,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.17.1' + node-version: '18.18.2' - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -96,7 +96,7 @@ jobs: with: version: 'v0.12.1' - name: Install rollup - run: sudo npm install -g rollup@3.28.1 + run: sudo npm install -g rollup@4.1.4 - name: Compile WASM run: wasm-pack build thoth-app/ --target web --release - name: Pack APP diff --git a/.github/workflows/run_migrations.yml b/.github/workflows/run_migrations.yml index 53cd3d2e..2d4b0c8a 100644 --- a/.github/workflows/run_migrations.yml +++ b/.github/workflows/run_migrations.yml @@ -43,7 +43,7 @@ jobs: - uses: actions/checkout@v3 - uses: actions/setup-node@v3 with: - node-version: '18.17.1' + node-version: '18.18.2' - uses: actions-rs/toolchain@v1 with: toolchain: stable @@ -51,7 +51,7 @@ jobs: with: version: 'v0.12.1' - name: Install rollup - run: sudo npm install -g rollup@3.28.1 + run: sudo npm install -g rollup@4.1.4 - name: Compile WASM run: wasm-pack build thoth-app/ --target web --release - name: Pack APP diff --git a/Dockerfile b/Dockerfile index b4ba259b..b457ef2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -ARG RUST_IMAGE=rust:1.72.0 -ARG MUSL_IMAGE=clux/muslrust:1.72.0 +ARG RUST_IMAGE=rust:1.73.0 +ARG MUSL_IMAGE=clux/muslrust:1.73.0 FROM ${RUST_IMAGE} as wasm -ENV NPM_VERSION=9.8.1 -ENV N_VERSION=9.1.0 -ENV NODE_VERSION=18.17.1 -ENV ROLLUP_VERSION=3.28.1 +ENV NPM_VERSION=10.2.0 +ENV N_VERSION=9.2.0 +ENV NODE_VERSION=18.18.2 +ENV ROLLUP_VERSION=4.1.4 ENV WASM_PACK_VERSION=0.12.1 ARG THOTH_GRAPHQL_API=https://api.thoth.pub diff --git a/Dockerfile.dev b/Dockerfile.dev index 3899edd7..3517398e 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,11 +1,11 @@ -ARG RUST_VERSION=1.72.0 +ARG RUST_VERSION=1.73.0 FROM rust:${RUST_VERSION} -ENV NPM_VERSION=9.8.1 -ENV N_VERSION=9.1.0 -ENV NODE_VERSION=18.17.1 -ENV ROLLUP_VERSION=3.28.1 +ENV NPM_VERSION=10.2.0 +ENV N_VERSION=9.2.0 +ENV NODE_VERSION=18.18.2 +ENV ROLLUP_VERSION=4.1.4 ENV WASM_PACK_VERSION=0.12.1 ARG THOTH_GRAPHQL_API=http://localhost:8000