Merge pull request #2761 from ORCID/lmendoza/PD-0000

PD-5108

Author: cryptalith

.github/workflows/bld_mvn.yml

@@ -9,11 +9,6 @@ permissions:
 on:
   workflow_call:
     inputs:
-      artifact_name:
-        description: 'Name of the artifact env'
-        required: false
-        default: 'prod'
-        type: string
       version_tag:
         description: 'Name of the tag to build'
         required: false
@@ -32,11 +27,6 @@ on:
 
   workflow_dispatch:
     inputs:
-      artifact_name:
-        description: 'Name of the artifact env'
-        required: false
-        default: 'prod'
-        type: string
       version_tag:
         description: 'Version tag to use: (bump must also be set to none to keep a specific version'
         required: false
@@ -61,14 +51,6 @@ on:
 
 jobs:
   bld_mvn:
-    strategy:
-      matrix:
-        include:
-          - artifact_name: prod
-          - artifact_name: sandbox
-          - artifact_name: qa
-          - artifact_name: int
-
     runs-on: ubuntu-latest
     steps:
       - name: git-checkout-ref-action
@@ -110,7 +92,7 @@ jobs:
         shell: bash
         env:
           version_tag_numeric: '${{ steps.version.outputs.version_tag_numeric }}'
-          project: '${{ matrix.artifact_name }}'
+          project: prod
 
       - name: bump version using prod profile
         run: |
@@ -128,24 +110,38 @@ jobs:
           git diff
           git rev-parse --abbrev-ref HEAD
 
-      - name: build our project and deploy
+      - name: build our project
         run: |
           mvn -T 1C --batch-mode \
               -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
-              --settings settings-deploy.xml \
               --file "pom.xml" \
-              -DaltReleaseDeploymentRepository="github::${ARTIFACT_URL}${ARTIFACT_REPO_PATH}" \
-              --activate-profiles "${build_env}" -Dnodejs.workingDirectory=. \
-              deploy -Dmaven.test.skip
+              --activate-profiles prod -Dnodejs.workingDirectory=. \
+              package -Dmaven.test.skip
 
           echo "------------------------------------------------------"
-
           find . -name '*.war'
           find . -name '*.jar'
         env:
           GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}'
-          ARTIFACT_URL: '${{ secrets.ARTIFACT_URL }}'
-          ARTIFACT_REPO_PATH: '${{ secrets.ARTIFACT_REPO_PATH }}'
-          ARTIFACT_USER: '${{ secrets.ARTIFACT_USER }}'
-          ARTIFACT_PASSWORD: '${{ secrets.ARTIFACT_PASSWORD }}'
-          build_env: '${{ matrix.artifact_name }}'
+
+      - name: deploy same artifact for all environments
+        run: |
+          WAR_FILE="target/orcid-web-frontend-prod.war"
+          REPO_URL="${ARTIFACT_URL}${ARTIFACT_REPO_PATH}"
+          for artifact_id in orcid-web-frontend-prod orcid-web-frontend-sandbox orcid-web-frontend-qa orcid-web-frontend-int; do
+            mvn -B deploy:deploy-file \
+              --settings settings-deploy.xml \
+              -Durl="${REPO_URL}" \
+              -DrepositoryId=github \
+              -DgroupId=org.orcid \
+              -DartifactId="${artifact_id}" \
+              -Dversion="${{ steps.version.outputs.version_tag_numeric }}" \
+              -Dpackaging=war \
+              -Dfile="${WAR_FILE}" \
+              -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+          done
+        env:
+          ARTIFACT_URL: ${{ secrets.ARTIFACT_URL }}
+          ARTIFACT_REPO_PATH: ${{ secrets.ARTIFACT_REPO_PATH }}
+          ARTIFACT_USER: ${{ secrets.ARTIFACT_USER }}
+          ARTIFACT_PASSWORD: ${{ secrets.ARTIFACT_PASSWORD }}

.github/workflows/bld_test_rel_tag.yml

@@ -23,6 +23,11 @@ on:
         type: boolean
         required: false
         default: true
+      run_docker:
+        description: 'Whether to run Docker builds'
+        type: boolean
+        required: false
+        default: false
 
   workflow_dispatch:
     inputs:
@@ -52,6 +57,11 @@ on:
         type: boolean
         required: false
         default: true
+      run_docker:
+        description: 'Whether to run Docker builds'
+        type: boolean
+        required: false
+        default: false
 
 # cancel running job if another commit comes in
 concurrency:
@@ -101,6 +111,7 @@ jobs:
       ref: ${{ inputs.ref }}
 
   bld_docker:
+    if: ${{ inputs.run_docker }}
     uses: ./.github/workflows/bld_docker.yml
     secrets: inherit # pass all secrets for uploading assets
     needs:

.github/workflows/bld_yarn.yml

@@ -7,31 +7,10 @@ permissions:
 
 on:
   workflow_call:
-    inputs:
-      artifact_name:
-        description: 'Name of the artifact env'
-        required: false
-        default: 'prod'
-        type: string
-
   workflow_dispatch:
-    inputs:
-      artifact_name:
-        description: 'Name of the artifact env'
-        required: false
-        default: 'prod'
-        type: string
 
 jobs:
   bld_yarn:
-    strategy:
-      matrix:
-        include:
-          - artifact_name: prod
-# yarn build is only used as a test
-#           - artifact_name: sandbox
-#           - artifact_name: qa
-#           - artifact_name: int
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:
@@ -41,4 +20,4 @@ jobs:
           node-version: 'v20.x'
           cache: 'yarn'
       - run: yarn
-      - run: yarn build:${{ inputs.artifact_name }}
+      - run: yarn build

Dockerfile.build.yarn

@@ -1,7 +1,5 @@
 FROM node:22.12.0-bullseye AS build
 
-ARG build_env
-
 WORKDIR /app
 
 COPY package.json .
@@ -16,7 +14,7 @@ COPY scripts/ scripts/
 
 # RUN apk add gettext
 
-RUN yarn build:${build_env}
+RUN yarn build
 
 FROM nginx:1.26.2-alpine
 #FROM nginx:1.26.2-bookworm

README.md

@@ -84,12 +84,9 @@ The following tools are not required to work on the project but they facilitate
 
 ## Build the application for other environments
 
-The following commands are used to build the application for non-local environments
+Build the application for deployment (prod, sandbox, qa, int all use the same asset; environment is resolved at runtime):
 
-- `yarn build:prod`
-- `yarn build:sandbox`
-- `yarn build:qa`
-- `yarn build:int`
+- `yarn build`
 
 ## Learn more
 

package.json

@@ -25,10 +25,6 @@
     "build:i18n:generate": "echo '⚠️  DEPRECATED: Generating XLF from .properties files. Use Transifex for translations instead.' && ts-node -P scripts/tsconfig.json scripts/translate-file-generator.prebuild.ts",
     "build:i18n": "yarn build:i18n:extract",
     "build-with-properties": "echo '⚠️  DEPRECATED: This build regenerates XLF files from .properties (deprecated workflow). Prefer using tx pull to get translations from Transifex.' && rimraf dist && yarn build:i18n:extract && yarn build:i18n:generate && yarn build:browserslist && npm run build-runtime-env && ng build --configuration production --localize && npm run postbuild",
-    "build:prod": "yarn build",
-    "build:sandbox": "yarn build",
-    "build:qa": "yarn build",
-    "build:int": "yarn build",
     "build:local": "yarn run prebuild && ng build --localize",
     "format": "npm run lint && prettier --write .",
     "build:report": "webpack-bundle-analyzer dist/en/stats.json",

pom.xml

@@ -87,7 +87,7 @@
                         <phase>generate-resources</phase>
                         <configuration>
                             <yarnInheritsProxyConfigFromMaven>false</yarnInheritsProxyConfigFromMaven>
-                            <arguments>build:${buildEnv}</arguments>
+                            <arguments>build</arguments>
                         </configuration>
                     </execution>
                 </executions>