Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V0 11 1 #562

Merged
merged 6 commits into from
Aug 24, 2022
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
10 changes: 1 addition & 9 deletions .github/workflows/package-dev-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
2 changes: 1 addition & 1 deletion packages/api/package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/discord-bot/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
2 changes: 0 additions & 2 deletions packages/frontend/.env.template
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion packages/frontend/package.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
1 change: 0 additions & 1 deletion packages/frontend/src/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion packages/frontend/src/model/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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,
};
Expand Down
2 changes: 1 addition & 1 deletion packages/mongodb/package.json
Original file line number Diff line number Diff line change
@@ -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."
}
2 changes: 1 addition & 1 deletion packages/setup/package.json
Original file line number Diff line number Diff line change
@@ -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.",
Expand Down