Skip to content

Commit

Permalink
Update instructions and remove stage-build
Browse files Browse the repository at this point in the history
  • Loading branch information
jhanninen committed Dec 19, 2024
1 parent 6acac49 commit fc265f7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 20 deletions.
10 changes: 0 additions & 10 deletions .github/workflows/deploy_prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,3 @@ jobs:
tags: production
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build UI and publish stage Docker image
uses: elgohr/Publish-Docker-Github-Action@v5
with:
name: hsldevcom/jore-map-ui
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }}
buildargs: APP_ENVIRONMENT=stage, APP_REACT_APP_DIGITRANSIT_API_KEY=${{ secrets.JOREMAPUI_DIGITRANSITAPIKEY_PROD }}, APP_DOMAIN=${{ secrets.APP_DOMAIN_STAGE }}, APP_BUILD_DATE=${{ steps.date.outputs.date }}
tags: stage
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
13 changes: 3 additions & 10 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
# Joukkoliikennerekisteri Map UI

### Cypress status

![Test dev](https://github.com/HSLdevcom/jore-map-ui/workflows/Test%20dev/badge.svg)

![Test stage](https://github.com/HSLdevcom/jore-map-ui/workflows/Test%20stage/badge.svg)

## Install

### Clone the repo via git
Expand Down Expand Up @@ -34,18 +28,17 @@ Runs at http://localhost:3000/

### Github actions builds docker images automatically with

- `:release-prod` tag, when code is pushed to `release-prod` branch
- `:stage` tag, when code is pushed to `master` branch
- `:production` tag, when code is pushed to `master` branch
- `:develop` tag, when code is pushed to `develop` branch

### Release a new version

(Note that the deployment from `master`-branch works also without a new release, so this might be considered as an obsolete feature.)

- `git checkout master && git pull origin master`
- `yarn run release`-(`major`/`minor`/`patch`)
- checkouts to a `Release-x.x.x` branch, creates a new tag, updates change log, pushes changes to remote
- make a pull request from `Release-x.x.x` branch -> `master` branch
- make a pull request from `master` branch -> `release-prod` branch
- deploy via `hsl gitlab/jore/jore-map-deploy` repository

## License

Expand Down

0 comments on commit fc265f7

Please sign in to comment.