Merge branch 'develop' into 2486-create-new-pipeline-for-updated-build-deployment

Author: mkimberlin

.github/workflows/gradle-build-development.yml

@@ -1,112 +0,0 @@
-name: Gradle Build & Deploy - Develop
-on:
-  push:
-    branches:
-      - 'develop'
-
-env:
-  PROJECT_ID: ${{ secrets.RUN_PROJECT }}
-  RUN_REGION: us-central1
-  SERVICE_NAME: checkins-develop
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    environment:
-      name: Development
-      url: https://checkins-develop-tuvcfzotpq-uc.a.run.app/
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up Node LTS
-        uses: actions/setup-node@v4
-        with:
-          node-version: '20'
-      - name: Set up JDK 21
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin' # See 'Supported distributions' for available options
-          java-version: 21
-      - name: Cache SonarQube packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
-      - name: Cache Gradle packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.gradle/caches
-          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
-          restore-keys: ${{ runner.os }}-gradle
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
-        with:
-          arguments: assemble
-        env:
-          VITE_APP_API_URL: https://checkins-develop-tuvcfzotpq-uc.a.run.app
-      - name: Gradle runs tests
-        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
-        with:
-          arguments: check
-#      - name: Do SonarQube checks
-#        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
-#        with:
-#          arguments: sonarqube --info
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
-#          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
-      - name: Setup python
-        run: |
-          sudo apt-get install python2.7
-      - name: Export gcloud related env variable
-        run: export CLOUDSDK_PYTHON="/usr/bin/python2"
-      # Setup gcloud CLI
-      - uses: google-github-actions/setup-gcloud@v0
-        with:
-          version: "290.0.1"
-          service_account_key: ${{ secrets.RUN_SA_KEY }}
-          project_id: ${{ secrets.RUN_PROJECT }}
-      - name: Auth Configure Docker
-        run: |-
-          gcloud --quiet auth configure-docker
-      - name: Build the Docker image
-        run: |-
-          cd server
-          docker build --tag "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" .
-      - name: Push the Docker image to Google Container Registry
-        run: |-
-          cd server
-          docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
-      - name: Deploy image to Cloud Run
-        run: |-
-          gcloud run deploy "$SERVICE_NAME" \
-            --quiet \
-            --region "$RUN_REGION" \
-            --image "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" \
-            --memory 1Gi \
-            --add-cloudsql-instances ${{ secrets.DB_CONNECTION_NAME }} \
-            --set-env-vars "CLOUD_DB_CONNECTION_NAME=${{ secrets.DB_CONNECTION_NAME }}" \
-            --set-env-vars "DB_NAME=${{ secrets.DB_NAME }}" \
-            --set-env-vars "DATASOURCES_DEFAULT_PASSWORD=${{ secrets.DB_PASSWORD }}" \
-            --set-env-vars "DATASOURCES_DEFAULT_USERNAME=${{ secrets.DB_USERNAME }}" \
-            --set-env-vars "AES_KEY=${{ secrets.AES_KEY }}" \
-            --set-env-vars "OAUTH_CLIENT_ID=${{ secrets.OAUTH_CLIENT_ID }}" \
-            --set-env-vars "OAUTH_CLIENT_SECRET=${{ secrets.OAUTH_CLIENT_SECRET }}" \
-            --set-env-vars "OAUTH_CALLBACK_URI"=${{ secrets.OAUTH_CALLBACK_URI }} \
-            --set-env-vars "DIRECTORY_ID=${{ secrets.DIRECTORY_ID }}" \
-            --set-env-vars "SERVICE_ACCOUNT_CREDENTIALS=${{ secrets.SERVICE_ACCOUNT_CREDENTIALS }}" \
-            --set-env-vars "GSUITE_SUPER_ADMIN=${{ secrets.GSUITE_SUPER_ADMIN }}" \
-            --set-env-vars "MJ_APIKEY_PUBLIC=${{ secrets.MJ_APIKEY_PUBLIC }}" \
-            --set-env-vars "MJ_APIKEY_PRIVATE=${{ secrets.MJ_APIKEY_PRIVATE }}" \
-            --set-env-vars "GIT_HUB_TOKEN=${{ secrets.GIT_HUB_TOKEN }}" \
-            --set-env-vars "WEB_ADDRESS=https://checkins-develop-tuvcfzotpq-uc.a.run.app" \
-            --set-env-vars "[email protected]" \
-            --set-env-vars "FROM_NAME=Check-Ins - DEVELOP" \
-            --set-env-vars "^@^MICRONAUT_ENVIRONMENTS=dev,cloud,google,gcp" \
-            --platform "managed" \
-            --max-instances 2 \
-            --allow-unauthenticated

.github/workflows/gradle-build-feature.yml

@@ -8,6 +8,8 @@ on:
       - 'doc-**/*'
       - 'hotfix-**/*'
       - 'dependabot/**/*'
+env:
+  HUSKY: 0
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -16,21 +18,15 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Set up Node LTS
+      - name: Set up Node Stable
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: 21
-      - name: Cache SonarQube packages
-        uses: actions/cache@v4
-        with:
-          path: ~/.sonar/cache
-          key: ${{ runner.os }}-sonar
-          restore-keys: ${{ runner.os }}-sonar
       - name: Cache Gradle packages
         uses: actions/cache@v4
         with:
@@ -39,19 +35,7 @@ jobs:
           restore-keys: ${{ runner.os }}-gradle
       - name: Validate Gradle wrapper
         uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
-        with:
-          arguments: assemble
       - name: Gradle runs tests
         uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
         with:
           arguments: check
-#      - name: Do SonarQube checks
-#        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
-#        with:
-#          arguments: sonarqube --info
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
-#          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
-#          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.github/workflows/gradle-build-native-feature.yml

@@ -0,0 +1,41 @@
+name: Gradle Build - Native - Feature / Bug
+on:
+  push:
+    branches:
+      - 'feature-**/*'
+      - 'bugfix-**/*'
+      - 'chore-**/*'
+      - 'doc-**/*'
+      - 'hotfix-**/*'
+      - 'dependabot/**/*'
+env:
+  HUSKY: 0
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Set up Node Stable
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+      - name: Set up GraalVM 21
+        uses: graalvm/[email protected]
+        with:
+          distribution: 'graalvm'
+          java-version: '21'
+      - name: Cache Gradle packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
+          restore-keys: ${{ runner.os }}-gradle
+      - name: Validate Gradle wrapper
+        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
+      - name: Gradle runs tests
+        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
+        with:
+          arguments: nativeTest

.github/workflows/gradle-build-production.yml

@@ -3,28 +3,29 @@ on:
   push:
     branches:
       - "master"
-
 env:
+  HUSKY: 0
   PROJECT_ID: ${{ secrets.RUN_PROJECT }}
   RUN_REGION: us-central1
   SERVICE_NAME: checkins-master
+  TARGET_URL: https://checkins.objectcomputing.com
 jobs:
   build:
     runs-on: ubuntu-latest
     permissions:
-      contents: read
-      packages: write
+      contents: 'read'
+      id-token: 'write'
     environment:
       name: Production
-      url: https://checkins.objectcomputing.com/
+      url: ${{ env.TARGET_URL }}
     steps:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
       - name: Set up Node LTS
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:
@@ -36,42 +37,29 @@ jobs:
           path: ~/.gradle/caches
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
           restore-keys: ${{ runner.os }}-gradle
-      - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
-      - name: Build with Gradle
-        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+      - id: 'auth'
+        uses: 'google-github-actions/auth@v2'
         with:
-          arguments: assemble
-        env:
-          VITE_APP_API_URL: https://checkins.objectcomputing.com
-#      - name: Publish package
-#        uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
-#        with:
-#          arguments: publish
-#        env:
-#          GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
-      - name: Setup python
-        run: |
-          sudo apt-get install python2.7
-      - name: Export gcloud related env variable
-        run: export CLOUDSDK_PYTHON="/usr/bin/python2"
-      - name: Setup gcloud CLI
-        uses: google-github-actions/setup-gcloud@v0
+          project_id: 'oci-intern-2019'
+          workload_identity_provider: 'projects/832140020593/locations/global/workloadIdentityPools/github/providers/my-repo'
+      - name: 'Set up Cloud SDK'
+        uses: google-github-actions/setup-gcloud@v2
         with:
-          version: "290.0.1"
-          service_account_key: ${{ secrets.RUN_SA_KEY }}
-          project_id: ${{ secrets.RUN_PROJECT }}
-      - name: Auth Configure Docker
+          version: '>= 363.0.0'
+      - name: 'Auth Configure Docker'
         run: |-
           gcloud --quiet auth configure-docker
       - name: Build the Docker image
         run: |-
+          ./gradlew assemble
           cd server
           docker build --tag "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" .
+        env:
+          VITE_APP_API_URL: ${{ env.TARGET_URL }}
       - name: Push the Docker image to Google Container Registry
-        run: |-
-          cd server
-          docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
+        run: docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
       - name: Deploy image to Cloud Run
         run: |-
           gcloud run deploy "$SERVICE_NAME" \
@@ -89,24 +77,19 @@ jobs:
             --set-env-vars "OAUTH_CLIENT_SECRET=${{ secrets.OAUTH_CLIENT_SECRET }}" \
             --set-env-vars "OAUTH_CALLBACK_URI"=${{ secrets.OAUTH_CALLBACK_URI }} \
             --set-env-vars "DIRECTORY_ID=${{ secrets.DIRECTORY_ID }}" \
-            --set-env-vars "TYPE=${{ secrets.SA_KEY_TYPE }}" \
-            --set-env-vars "PROJECT_ID=${{ secrets.RUN_PROJECT }}" \
-            --set-env-vars "PRIVATE_KEY_ID=${{ secrets.SA_PRIVATE_KEY_ID }}" \
-            --set-env-vars "PRIVATE_KEY=${{ secrets.SA_PRIVATE_KEY }}" \
-            --set-env-vars "CLIENT_EMAIL=${{ secrets.SA_CLIENT_EMAIL }}" \
-            --set-env-vars "CLIENT_ID=${{ secrets.SA_CLIENT_ID }}" \
-            --set-env-vars "AUTH_URI=${{ secrets.SA_AUTH_URI }}" \
-            --set-env-vars "TOKEN_URI=${{ secrets.SA_TOKEN_URI }}" \
-            --set-env-vars "AUTH_PROVIDER_X509_CERT_URL=${{ secrets.SA_AUTH_PROVIDER_X509_CERT_URL }}" \
-            --set-env-vars "CLIENT_X509_CERT_URL=${{ secrets.SA_CLIENT_X509_CERT_URL }}" \
+            --set-env-vars "SERVICE_ACCOUNT_CREDENTIALS=${{ secrets.SERVICE_ACCOUNT_CREDENTIALS }}" \
             --set-env-vars "GSUITE_SUPER_ADMIN=${{ secrets.GSUITE_SUPER_ADMIN }}" \
             --set-env-vars "MJ_APIKEY_PUBLIC=${{ secrets.MJ_APIKEY_PUBLIC }}" \
             --set-env-vars "MJ_APIKEY_PRIVATE=${{ secrets.MJ_APIKEY_PRIVATE }}" \
             --set-env-vars "GIT_HUB_TOKEN=${{ secrets.GIT_HUB_TOKEN }}" \
-            --set-env-vars "WEB_ADDRESS=https://checkins.objectcomputing.com" \
-            --set-env-vars "FROM_ADDRESS=kimberlinm@objectcomputing.com" \
+            --set-env-vars "WEB_ADDRESS=${{ env.TARGET_URL }}" \
+            --set-env-vars "FROM_ADDRESS=no-reply@objectcomputing.com" \
             --set-env-vars "FROM_NAME=Check-Ins" \
             --set-env-vars "^@^MICRONAUT_ENVIRONMENTS=cloud,google,gcp" \
+            --set-env-vars "SLACK_WEBHOOK_URL=${{ secrets.SLACK_WEBHOOK_URL }}" \
+            --set-env-vars "SLACK_BOT_TOKEN=${{ secrets.SLACK_BOT_TOKEN }}" \
+            --set-env-vars "SLACK_KUDOS_CHANNEL_ID=${{ secrets.SLACK_KUDOS_CHANNEL_ID }}" \
+            --set-env-vars "SLACK_SIGNING_SECRET=${{ secrets.SLACK_PULSE_SIGNING_SECRET }}" \
             --platform "managed" \
-            --max-instances 5 \
+            --max-instances 8 \
             --allow-unauthenticated

.github/workflows/gradle-build-publish.yml

@@ -2,6 +2,8 @@ name: Gradle Publish to GitHub Packages
 on:
   release:
     types: [created]
+env:
+  HUSKY: 0
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -10,10 +12,10 @@ jobs:
       packages: write
     steps:
       - uses: actions/checkout@v4
-      - name: Set up Node LTS
+      - name: Set up Node Stable
         uses: actions/setup-node@v2-beta
         with:
-          node-version: '20'
+          node-version: '22'
       - name: Set up JDK 21
         uses: actions/setup-java@v4
         with:

.github/workflows/gradle-dependency-submission.yml

@@ -0,0 +1,23 @@
+name: Gradle Dependency Submission
+
+on:
+  push:
+    branches: [ 'develop', 'master', 'feature-2532/graal' ]
+env:
+  HUSKY: 0
+permissions:
+  contents: write
+
+jobs:
+  dependency-submission:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 21
+      - name: Generate and submit dependency graph
+        uses: gradle/actions/dependency-submission@v4