Skip to content

Commit

Permalink
Merge pull request #517 from thoth-pub/feature/upgrade_rust_1_73
Browse files Browse the repository at this point in the history
Feature/upgrade rust 1 73
  • Loading branch information
ja573 authored Oct 18, 2023
2 parents 6ec1b59 + 035e236 commit 7fefd70
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 19 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build_test_and_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,15 @@ 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
- uses: jetli/[email protected]
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
Expand All @@ -59,15 +59,15 @@ 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
- uses: jetli/[email protected]
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
Expand All @@ -88,15 +88,15 @@ 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
- uses: jetli/[email protected]
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
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ 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
- uses: jetli/[email protected]
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
Expand Down
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
10 changes: 5 additions & 5 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 7fefd70

Please sign in to comment.