From 6eac45e621e2f04504927d86ebac00ad49ef294f Mon Sep 17 00:00:00 2001 From: kristoferlund Date: Wed, 24 Aug 2022 16:16:16 +0200 Subject: [PATCH 1/6] Revert GitHub action to previous format --- .github/workflows/package-dev-frontend.yml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/package-dev-frontend.yml b/.github/workflows/package-dev-frontend.yml index 41e7984dc..115eed958 100644 --- a/.github/workflows/package-dev-frontend.yml +++ b/.github/workflows/package-dev-frontend.yml @@ -14,20 +14,12 @@ jobs: contents: read packages: write - steps: + steps: - uses: actions/checkout@v2 name: Check out code - - uses: martinbeentjes/npm-get-version-action@main - name: get-npm-version - id: package-version - with: - path: packages/frontend - - uses: mr-smithers-excellent/docker-build-push@v5 name: Build and push Docker image - env: - REACT_APP_VERSION: ${{ steps.package-version.outputs.current-version}} with: image: $IMAGE_NAME tags: latest From 0e0a1ab16bc3d20383a574436a0d8ca94b5bbac7 Mon Sep 17 00:00:00 2001 From: kristoferlund Date: Wed, 24 Aug 2022 16:17:15 +0200 Subject: [PATCH 2/6] Increase version number to v0.11.1 --- package.json | 2 +- packages/api/package.json | 2 +- packages/discord-bot/package.json | 2 +- packages/frontend/package.json | 2 +- packages/mongodb/package.json | 2 +- packages/setup/package.json | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b18248ab6..63effb5c4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "praise", - "version": "0.11.0", + "version": "0.11.1", "license": "GPL-3.0-or-later", "description": "Praise community contributions to build a culture of giving and gratitude.", "private": true, diff --git a/packages/api/package.json b/packages/api/package.json index 74f3df524..5693e376f 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -1,6 +1,6 @@ { "name": "api", - "version": "0.11.0", + "version": "0.11.1", "license": "GPL-3.0-or-later", "description": "The Praise REST API running on Node/Express, using MongoDB for storage.", "type": "commonjs", diff --git a/packages/discord-bot/package.json b/packages/discord-bot/package.json index 916999bb5..18148988b 100644 --- a/packages/discord-bot/package.json +++ b/packages/discord-bot/package.json @@ -1,6 +1,6 @@ { "name": "discord-bot", - "version": "0.11.0", + "version": "0.11.1", "license": "GPL-3.0-or-later", "description": "The Praise Discord bot is the main way for users to interact with the Praise system.", "dependencies": { diff --git a/packages/frontend/package.json b/packages/frontend/package.json index 4c329b813..438d84ed7 100644 --- a/packages/frontend/package.json +++ b/packages/frontend/package.json @@ -1,6 +1,6 @@ { "name": "frontend", - "version": "0.11.0", + "version": "0.11.1", "license": "GPL-3.0-or-later", "description": "The Praise dashboard built on React/Recoil/Tailwind CSS.", "private": true, diff --git a/packages/mongodb/package.json b/packages/mongodb/package.json index cf35c30cd..1ea935f30 100644 --- a/packages/mongodb/package.json +++ b/packages/mongodb/package.json @@ -1,6 +1,6 @@ { "name": "mongodb", - "version": "0.11.0", + "version": "0.11.1", "license": "GPL-3.0-or-later", "description": "The Prasie data is stored in a MongoDb database." } diff --git a/packages/setup/package.json b/packages/setup/package.json index 2b545d5fe..14874e814 100644 --- a/packages/setup/package.json +++ b/packages/setup/package.json @@ -1,6 +1,6 @@ { "name": "setup", - "version": "0.11.0", + "version": "0.11.1", "license": "GPL-3.0-or-later", "type": "commonjs", "description": "Praise ENV setup scripts.", From e9f734ef2c76475bde4a091a9e2a8350334aa701 Mon Sep 17 00:00:00 2001 From: kristoferlund Date: Wed, 24 Aug 2022 16:20:54 +0200 Subject: [PATCH 3/6] CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 707c5b0bb..527aa3a4f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +## [0.11.1] - 2022-08-24 + +Hotfix resolving an issue with building Docker images for production. + ## [0.11.0] - 2022-08-24 ### Added From 3cd69665c74b42c21457e75f621d77134847f4ac Mon Sep 17 00:00:00 2001 From: kristoferlund Date: Wed, 24 Aug 2022 16:29:07 +0200 Subject: [PATCH 4/6] Removed REACT_APP_VERSION from .ev.template --- packages/frontend/.env.template | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/frontend/.env.template b/packages/frontend/.env.template index fefc1e7d1..9b534f034 100644 --- a/packages/frontend/.env.template +++ b/packages/frontend/.env.template @@ -11,5 +11,3 @@ REACT_APP_SERVER_URL=https://localhost # Port number used when running frontend for development, outside of Docker PORT=3000 -# App version from package.json -REACT_APP_VERSION=$npm_package_version From 0b19d01c7e8ad4204f4d14af1613d679ba99dc03 Mon Sep 17 00:00:00 2001 From: kristoferlund Date: Wed, 24 Aug 2022 16:29:46 +0200 Subject: [PATCH 5/6] Removed eth chain icon loading using REACT_APP_SERVER_URL --- packages/frontend/src/index.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/frontend/src/index.tsx b/packages/frontend/src/index.tsx index df6175cd7..185d4f714 100644 --- a/packages/frontend/src/index.tsx +++ b/packages/frontend/src/index.tsx @@ -31,7 +31,6 @@ const gnosisChain: Chain = { id: 100, name: 'Gnosis Chain', network: 'Gnosis Chain', - iconUrl: `${process.env.REACT_APP_SERVER_URL}/uploads/gnosischain_logo.png`, nativeCurrency: { decimals: 18, name: 'xDAI', From 65f6d4491c30526d6c476f731a4b0341b15c59cd Mon Sep 17 00:00:00 2001 From: kristoferlund Date: Wed, 24 Aug 2022 16:30:25 +0200 Subject: [PATCH 6/6] ENV not available at build time, hardcode version no for now --- packages/frontend/src/model/app.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/frontend/src/model/app.ts b/packages/frontend/src/model/app.ts index cf5225fc5..34a8a9127 100644 --- a/packages/frontend/src/model/app.ts +++ b/packages/frontend/src/model/app.ts @@ -32,7 +32,7 @@ interface PraiseAppVersion { export const usePraiseAppVersion = (): PraiseAppVersion => { const appVersion: PraiseAppVersion = { - current: process.env.REACT_APP_VERSION, + current: 'v0.11.1', //TODO: get this from package.json latest: undefined, newVersionAvailable: false, };