diff --git a/.github/workflows/deploy_prod.yml b/.github/workflows/deploy_prod.yml index 8bab5aef2..622f9ba40 100644 --- a/.github/workflows/deploy_prod.yml +++ b/.github/workflows/deploy_prod.yml @@ -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 }} diff --git a/README.md b/README.md index c028fbe82..f7c9e25ac 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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