-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Attempt to fix production build (#419)
* #1341 "pin" edit tag row outside of tag list * #1341 "pin" edit tag row outside of tag list (#410) Co-authored-by: matej <[email protected]> * - fixed problem with tags not visually updating on observations * - implemented changes requested in #1326 * - implemented #1357 * Implements #1376, #1361, #1354 (#412) * - first implementation of #1354 * - updated message for #1354 * - cleanup for #1354 * - implemented #1361 - improvements for #1354 * - implemented #1376 - also fixed bug in download structures dialog where only first download got added to the dropdown menu * Implements purple part of #1370 (#413) * - first implementation of #1354 * - updated message for #1354 * - cleanup for #1354 * - implemented #1361 - improvements for #1354 * - implemented #1376 - also fixed bug in download structures dialog where only first download got added to the dropdown menu * - partial fix for purple release for #1370 * Partial implementation of #1357 (#415) * - first implementation of #1354 * - updated message for #1354 * - cleanup for #1354 * - implemented #1361 - improvements for #1354 * - implemented #1376 - also fixed bug in download structures dialog where only first download got added to the dropdown menu * - partial fix for purple release for #1370 * - using official backend version * - DELETE button disabled for #1357 * ci: Attempt to fix f/e actions --------- Co-authored-by: matej <[email protected]> Co-authored-by: boriskovar-m2ms <[email protected]> Co-authored-by: Warren Thompson <[email protected]> Co-authored-by: Alan Christie <[email protected]>
- Loading branch information
5 people
authored
Mar 13, 2024
1 parent
35eb897
commit 6ff6173
Showing
3 changed files
with
37 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,19 +66,13 @@ jobs: | |
| push: ${{ steps.vars.outputs.push }} | ||
| steps: | ||
| - name: Inject slug/short variables | ||
| uses: rlespinasse/github-slug-action@v3.x | ||
| uses: rlespinasse/github-slug-action@v4 | ||
| - name: Initialise workflow variables | ||
| id: vars | ||
| env: | ||
| DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} | ||
| TRIGGER_DOWNSTREAM: ${{ secrets.TRIGGER_DOWNSTREAM }} | ||
| run: | | ||
| # BE_IMAGE_TAG | ||
| BE_IMAGE_TAG="${{ env.BE_IMAGE_TAG }}" | ||
| if [ -n "${{ secrets.BE_IMAGE_TAG }}" ]; then BE_IMAGE_TAG="${{ secrets.BE_IMAGE_TAG }}"; fi | ||
| echo BE_IMAGE_TAG=${BE_IMAGE_TAG} | ||
| echo "BE_IMAGE_TAG=${BE_IMAGE_TAG}" >> $GITHUB_OUTPUT | ||
| # BE_NAMESPACE | ||
| BE_NAMESPACE="${{ env.BE_NAMESPACE }}" | ||
| if [ -n "${{ secrets.BE_NAMESPACE }}" ]; then BE_NAMESPACE="${{ secrets.BE_NAMESPACE }}"; fi | ||
|
|
@@ -88,7 +82,7 @@ jobs: | |
| # FE_IMAGE_TAG | ||
| FE_IMAGE_TAG="${{ env.FE_IMAGE_TAG }}" | ||
| if [ -n "${{ secrets.FE_IMAGE_TAG }}" ]; then FE_IMAGE_TAG="${{ secrets.FE_IMAGE_TAG }}"; fi | ||
| echo FE_IMAGE_TAG={FE_IMAGE_TAG} | ||
| echo FE_IMAGE_TAG=${FE_IMAGE_TAG} | ||
| echo "FE_IMAGE_TAG=${FE_IMAGE_TAG}" >> $GITHUB_OUTPUT | ||
| # FE_NAMESPACE | ||
|
|
@@ -115,6 +109,12 @@ jobs: | |
| echo STACK_NAMESPACE=${STACK_NAMESPACE} | ||
| echo "STACK_NAMESPACE=${STACK_NAMESPACE}" >> $GITHUB_OUTPUT | ||
| # What image tag are we using? 'latest' (if not tagged) or a GitHub tag? | ||
| TAG="latest" | ||
| if [[ "${{ github.ref }}" =~ ^refs/tags/ ]]; then TAG="${{ env.GITHUB_REF_SLUG }}"; fi | ||
| echo tag=${TAG} | ||
| echo "tag=${TAG}" >> $GITHUB_OUTPUT | ||
| # Do we push, i.e. is DOCKERHUB_USERNAME defined? | ||
| echo push=${{ env.DOCKERHUB_USERNAME != '' }} | ||
| echo "push=${{ env.DOCKERHUB_USERNAME != '' }}" >> $GITHUB_OUTPUT | ||
|
|
@@ -124,12 +124,19 @@ jobs: | |
| echo "trigger=${{ env.TRIGGER_DOWNSTREAM == 'yes' }}" >> $GITHUB_OUTPUT | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
| uses: actions/checkout@v4 | ||
| - name: Lint Dockerfile | ||
| uses: hadolint/[email protected] | ||
| with: | ||
| dockerfile: Dockerfile | ||
| - name: Build | ||
| uses: docker/build-push-action@v4 | ||
| uses: docker/build-push-action@v5 | ||
| with: | ||
| tags: ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.FE_IMAGE_TAG }} | ||
| - name: Login to Docker Hub | ||
| context: . | ||
| tags: | | ||
| ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.tag }} | ||
| ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:stable | ||
| - name: Login to DockerHub | ||
| if: steps.vars.outputs.push == 'true' | ||
| uses: docker/login-action@v3 | ||
| with: | ||
|
|
@@ -138,7 +145,8 @@ jobs: | |
| - name: Push | ||
| if: steps.vars.outputs.push == 'true' | ||
| run: | | ||
| docker push ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.FE_IMAGE_TAG }} | ||
| docker push ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:${{ steps.vars.outputs.tag }} | ||
| docker push ${{ steps.vars.outputs.FE_NAMESPACE }}/fragalysis-frontend:stable | ||
| # Trigger the stack for this build, | ||
| # identifying the 'stable' backend (or whatever BE_IMAGE_TAG was used) | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters