Skip to content

Commit c19822b

Browse files
mkimberlinmkimberlin
committed
Merge branch 'develop' into 2486-create-new-pipeline-for-updated-build-deployment
2 parents f1430f1 + 2c8079a commit c19822b

703 files changed

Lines changed: 34920 additions & 28696 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 0 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -1,112 +0,0 @@
1-
name: Gradle Build & Deploy - Develop
2-
on:
3-
push:
4-
branches:
5-
- 'develop'
6-
7-
env:
8-
PROJECT_ID: ${{ secrets.RUN_PROJECT }}
9-
RUN_REGION: us-central1
10-
SERVICE_NAME: checkins-develop
11-
jobs:
12-
build:
13-
runs-on: ubuntu-latest
14-
environment:
15-
name: Development
16-
url: https://checkins-develop-tuvcfzotpq-uc.a.run.app/
17-
steps:
18-
- uses: actions/checkout@v4
19-
with:
20-
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
21-
- name: Set up Node LTS
22-
uses: actions/setup-node@v4
23-
with:
24-
node-version: '20'
25-
- name: Set up JDK 21
26-
uses: actions/setup-java@v4
27-
with:
28-
distribution: 'temurin' # See 'Supported distributions' for available options
29-
java-version: 21
30-
- name: Cache SonarQube packages
31-
uses: actions/cache@v4
32-
with:
33-
path: ~/.sonar/cache
34-
key: ${{ runner.os }}-sonar
35-
restore-keys: ${{ runner.os }}-sonar
36-
- name: Cache Gradle packages
37-
uses: actions/cache@v4
38-
with:
39-
path: ~/.gradle/caches
40-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
41-
restore-keys: ${{ runner.os }}-gradle
42-
- name: Validate Gradle wrapper
43-
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
44-
- name: Build with Gradle
45-
uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
46-
with:
47-
arguments: assemble
48-
env:
49-
VITE_APP_API_URL: https://checkins-develop-tuvcfzotpq-uc.a.run.app
50-
- name: Gradle runs tests
51-
uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
52-
with:
53-
arguments: check
54-
# - name: Do SonarQube checks
55-
# uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
56-
# with:
57-
# arguments: sonarqube --info
58-
# env:
59-
# GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
60-
# SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
61-
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
62-
- name: Setup python
63-
run: |
64-
sudo apt-get install python2.7
65-
- name: Export gcloud related env variable
66-
run: export CLOUDSDK_PYTHON="/usr/bin/python2"
67-
# Setup gcloud CLI
68-
- uses: google-github-actions/setup-gcloud@v0
69-
with:
70-
version: "290.0.1"
71-
service_account_key: ${{ secrets.RUN_SA_KEY }}
72-
project_id: ${{ secrets.RUN_PROJECT }}
73-
- name: Auth Configure Docker
74-
run: |-
75-
gcloud --quiet auth configure-docker
76-
- name: Build the Docker image
77-
run: |-
78-
cd server
79-
docker build --tag "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" .
80-
- name: Push the Docker image to Google Container Registry
81-
run: |-
82-
cd server
83-
docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
84-
- name: Deploy image to Cloud Run
85-
run: |-
86-
gcloud run deploy "$SERVICE_NAME" \
87-
--quiet \
88-
--region "$RUN_REGION" \
89-
--image "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" \
90-
--memory 1Gi \
91-
--add-cloudsql-instances ${{ secrets.DB_CONNECTION_NAME }} \
92-
--set-env-vars "CLOUD_DB_CONNECTION_NAME=${{ secrets.DB_CONNECTION_NAME }}" \
93-
--set-env-vars "DB_NAME=${{ secrets.DB_NAME }}" \
94-
--set-env-vars "DATASOURCES_DEFAULT_PASSWORD=${{ secrets.DB_PASSWORD }}" \
95-
--set-env-vars "DATASOURCES_DEFAULT_USERNAME=${{ secrets.DB_USERNAME }}" \
96-
--set-env-vars "AES_KEY=${{ secrets.AES_KEY }}" \
97-
--set-env-vars "OAUTH_CLIENT_ID=${{ secrets.OAUTH_CLIENT_ID }}" \
98-
--set-env-vars "OAUTH_CLIENT_SECRET=${{ secrets.OAUTH_CLIENT_SECRET }}" \
99-
--set-env-vars "OAUTH_CALLBACK_URI"=${{ secrets.OAUTH_CALLBACK_URI }} \
100-
--set-env-vars "DIRECTORY_ID=${{ secrets.DIRECTORY_ID }}" \
101-
--set-env-vars "SERVICE_ACCOUNT_CREDENTIALS=${{ secrets.SERVICE_ACCOUNT_CREDENTIALS }}" \
102-
--set-env-vars "GSUITE_SUPER_ADMIN=${{ secrets.GSUITE_SUPER_ADMIN }}" \
103-
--set-env-vars "MJ_APIKEY_PUBLIC=${{ secrets.MJ_APIKEY_PUBLIC }}" \
104-
--set-env-vars "MJ_APIKEY_PRIVATE=${{ secrets.MJ_APIKEY_PRIVATE }}" \
105-
--set-env-vars "GIT_HUB_TOKEN=${{ secrets.GIT_HUB_TOKEN }}" \
106-
--set-env-vars "WEB_ADDRESS=https://checkins-develop-tuvcfzotpq-uc.a.run.app" \
107-
--set-env-vars "FROM_ADDRESS=kimberlinm@objectcomputing.com" \
108-
--set-env-vars "FROM_NAME=Check-Ins - DEVELOP" \
109-
--set-env-vars "^@^MICRONAUT_ENVIRONMENTS=dev,cloud,google,gcp" \
110-
--platform "managed" \
111-
--max-instances 2 \
112-
--allow-unauthenticated

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

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
- 'doc-**/*'
99
- 'hotfix-**/*'
1010
- 'dependabot/**/*'
11+
env:
12+
HUSKY: 0
1113
jobs:
1214
build:
1315
runs-on: ubuntu-latest
@@ -16,21 +18,15 @@ jobs:
1618
uses: actions/checkout@v4
1719
with:
1820
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
19-
- name: Set up Node LTS
21+
- name: Set up Node Stable
2022
uses: actions/setup-node@v4
2123
with:
22-
node-version: '20'
24+
node-version: '22'
2325
- name: Set up JDK 21
2426
uses: actions/setup-java@v4
2527
with:
2628
distribution: 'temurin' # See 'Supported distributions' for available options
2729
java-version: 21
28-
- name: Cache SonarQube packages
29-
uses: actions/cache@v4
30-
with:
31-
path: ~/.sonar/cache
32-
key: ${{ runner.os }}-sonar
33-
restore-keys: ${{ runner.os }}-sonar
3430
- name: Cache Gradle packages
3531
uses: actions/cache@v4
3632
with:
@@ -39,19 +35,7 @@ jobs:
3935
restore-keys: ${{ runner.os }}-gradle
4036
- name: Validate Gradle wrapper
4137
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
42-
- name: Build with Gradle
43-
uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
44-
with:
45-
arguments: assemble
4638
- name: Gradle runs tests
4739
uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
4840
with:
4941
arguments: check
50-
# - name: Do SonarQube checks
51-
# uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
52-
# with:
53-
# arguments: sonarqube --info
54-
# env:
55-
# GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
56-
# SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
57-
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

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

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Gradle Build - Native - Feature / Bug
2+
on:
3+
push:
4+
branches:
5+
- 'feature-**/*'
6+
- 'bugfix-**/*'
7+
- 'chore-**/*'
8+
- 'doc-**/*'
9+
- 'hotfix-**/*'
10+
- 'dependabot/**/*'
11+
env:
12+
HUSKY: 0
13+
jobs:
14+
build:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout
18+
uses: actions/checkout@v4
19+
with:
20+
fetch-depth: 0
21+
- name: Set up Node Stable
22+
uses: actions/setup-node@v4
23+
with:
24+
node-version: '22'
25+
- name: Set up GraalVM 21
26+
uses: graalvm/setup-graalvm@v1.1.8
27+
with:
28+
distribution: 'graalvm'
29+
java-version: '21'
30+
- name: Cache Gradle packages
31+
uses: actions/cache@v4
32+
with:
33+
path: ~/.gradle/caches
34+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
35+
restore-keys: ${{ runner.os }}-gradle
36+
- name: Validate Gradle wrapper
37+
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
38+
- name: Gradle runs tests
39+
uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
40+
with:
41+
arguments: nativeTest

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

Lines changed: 28 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,29 @@ on:
33
push:
44
branches:
55
- "master"
6-
76
env:
7+
HUSKY: 0
88
PROJECT_ID: ${{ secrets.RUN_PROJECT }}
99
RUN_REGION: us-central1
1010
SERVICE_NAME: checkins-master
11+
TARGET_URL: https://checkins.objectcomputing.com
1112
jobs:
1213
build:
1314
runs-on: ubuntu-latest
1415
permissions:
15-
contents: read
16-
packages: write
16+
contents: 'read'
17+
id-token: 'write'
1718
environment:
1819
name: Production
19-
url: https://checkins.objectcomputing.com/
20+
url: ${{ env.TARGET_URL }}
2021
steps:
2122
- uses: actions/checkout@v4
2223
with:
2324
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
2425
- name: Set up Node LTS
2526
uses: actions/setup-node@v4
2627
with:
27-
node-version: '20'
28+
node-version: '22'
2829
- name: Set up JDK 21
2930
uses: actions/setup-java@v4
3031
with:
@@ -36,42 +37,29 @@ jobs:
3637
path: ~/.gradle/caches
3738
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
3839
restore-keys: ${{ runner.os }}-gradle
39-
- name: Validate Gradle wrapper
40-
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
41-
- name: Build with Gradle
42-
uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
40+
- name: Setup Gradle
41+
uses: gradle/actions/setup-gradle@v4
42+
- id: 'auth'
43+
uses: 'google-github-actions/auth@v2'
4344
with:
44-
arguments: assemble
45-
env:
46-
VITE_APP_API_URL: https://checkins.objectcomputing.com
47-
# - name: Publish package
48-
# uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
49-
# with:
50-
# arguments: publish
51-
# env:
52-
# GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
53-
- name: Setup python
54-
run: |
55-
sudo apt-get install python2.7
56-
- name: Export gcloud related env variable
57-
run: export CLOUDSDK_PYTHON="/usr/bin/python2"
58-
- name: Setup gcloud CLI
59-
uses: google-github-actions/setup-gcloud@v0
45+
project_id: 'oci-intern-2019'
46+
workload_identity_provider: 'projects/832140020593/locations/global/workloadIdentityPools/github/providers/my-repo'
47+
- name: 'Set up Cloud SDK'
48+
uses: google-github-actions/setup-gcloud@v2
6049
with:
61-
version: "290.0.1"
62-
service_account_key: ${{ secrets.RUN_SA_KEY }}
63-
project_id: ${{ secrets.RUN_PROJECT }}
64-
- name: Auth Configure Docker
50+
version: '>= 363.0.0'
51+
- name: 'Auth Configure Docker'
6552
run: |-
6653
gcloud --quiet auth configure-docker
6754
- name: Build the Docker image
6855
run: |-
56+
./gradlew assemble
6957
cd server
7058
docker build --tag "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" .
59+
env:
60+
VITE_APP_API_URL: ${{ env.TARGET_URL }}
7161
- name: Push the Docker image to Google Container Registry
72-
run: |-
73-
cd server
74-
docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
62+
run: docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
7563
- name: Deploy image to Cloud Run
7664
run: |-
7765
gcloud run deploy "$SERVICE_NAME" \
@@ -89,24 +77,19 @@ jobs:
8977
--set-env-vars "OAUTH_CLIENT_SECRET=${{ secrets.OAUTH_CLIENT_SECRET }}" \
9078
--set-env-vars "OAUTH_CALLBACK_URI"=${{ secrets.OAUTH_CALLBACK_URI }} \
9179
--set-env-vars "DIRECTORY_ID=${{ secrets.DIRECTORY_ID }}" \
92-
--set-env-vars "TYPE=${{ secrets.SA_KEY_TYPE }}" \
93-
--set-env-vars "PROJECT_ID=${{ secrets.RUN_PROJECT }}" \
94-
--set-env-vars "PRIVATE_KEY_ID=${{ secrets.SA_PRIVATE_KEY_ID }}" \
95-
--set-env-vars "PRIVATE_KEY=${{ secrets.SA_PRIVATE_KEY }}" \
96-
--set-env-vars "CLIENT_EMAIL=${{ secrets.SA_CLIENT_EMAIL }}" \
97-
--set-env-vars "CLIENT_ID=${{ secrets.SA_CLIENT_ID }}" \
98-
--set-env-vars "AUTH_URI=${{ secrets.SA_AUTH_URI }}" \
99-
--set-env-vars "TOKEN_URI=${{ secrets.SA_TOKEN_URI }}" \
100-
--set-env-vars "AUTH_PROVIDER_X509_CERT_URL=${{ secrets.SA_AUTH_PROVIDER_X509_CERT_URL }}" \
101-
--set-env-vars "CLIENT_X509_CERT_URL=${{ secrets.SA_CLIENT_X509_CERT_URL }}" \
80+
--set-env-vars "SERVICE_ACCOUNT_CREDENTIALS=${{ secrets.SERVICE_ACCOUNT_CREDENTIALS }}" \
10281
--set-env-vars "GSUITE_SUPER_ADMIN=${{ secrets.GSUITE_SUPER_ADMIN }}" \
10382
--set-env-vars "MJ_APIKEY_PUBLIC=${{ secrets.MJ_APIKEY_PUBLIC }}" \
10483
--set-env-vars "MJ_APIKEY_PRIVATE=${{ secrets.MJ_APIKEY_PRIVATE }}" \
10584
--set-env-vars "GIT_HUB_TOKEN=${{ secrets.GIT_HUB_TOKEN }}" \
106-
--set-env-vars "WEB_ADDRESS=https://checkins.objectcomputing.com" \
107-
--set-env-vars "FROM_ADDRESS=kimberlinm@objectcomputing.com" \
85+
--set-env-vars "WEB_ADDRESS=${{ env.TARGET_URL }}" \
86+
--set-env-vars "FROM_ADDRESS=no-reply@objectcomputing.com" \
10887
--set-env-vars "FROM_NAME=Check-Ins" \
10988
--set-env-vars "^@^MICRONAUT_ENVIRONMENTS=cloud,google,gcp" \
89+
--set-env-vars "SLACK_WEBHOOK_URL=${{ secrets.SLACK_WEBHOOK_URL }}" \
90+
--set-env-vars "SLACK_BOT_TOKEN=${{ secrets.SLACK_BOT_TOKEN }}" \
91+
--set-env-vars "SLACK_KUDOS_CHANNEL_ID=${{ secrets.SLACK_KUDOS_CHANNEL_ID }}" \
92+
--set-env-vars "SLACK_SIGNING_SECRET=${{ secrets.SLACK_PULSE_SIGNING_SECRET }}" \
11093
--platform "managed" \
111-
--max-instances 5 \
94+
--max-instances 8 \
11295
--allow-unauthenticated

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ name: Gradle Publish to GitHub Packages
22
on:
33
release:
44
types: [created]
5+
env:
6+
HUSKY: 0
57
jobs:
68
build:
79
runs-on: ubuntu-latest
@@ -10,10 +12,10 @@ jobs:
1012
packages: write
1113
steps:
1214
- uses: actions/checkout@v4
13-
- name: Set up Node LTS
15+
- name: Set up Node Stable
1416
uses: actions/setup-node@v2-beta
1517
with:
16-
node-version: '20'
18+
node-version: '22'
1719
- name: Set up JDK 21
1820
uses: actions/setup-java@v4
1921
with:

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Gradle Dependency Submission
2+
3+
on:
4+
push:
5+
branches: [ 'develop', 'master', 'feature-2532/graal' ]
6+
env:
7+
HUSKY: 0
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
dependency-submission:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout sources
16+
uses: actions/checkout@v4
17+
- name: Setup Java
18+
uses: actions/setup-java@v4
19+
with:
20+
distribution: 'temurin'
21+
java-version: 21
22+
- name: Generate and submit dependency graph
23+
uses: gradle/actions/dependency-submission@v4

0 commit comments

Comments
 (0)