Skip to content

Commit 7b00d06

Browse files
authored
Merge pull request #2699 from objectcomputing/release/0.8
Release/0.8
2 parents 3261365 + 5352df7 commit 7b00d06

File tree

1,306 files changed

+71912
-295874
lines changed

Some content is hidden

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

1,306 files changed

+71912
-295874
lines changed

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

Lines changed: 0 additions & 120 deletions
This file was deleted.

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

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,44 +13,27 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- name: Checkout
16-
uses: actions/checkout@v2
16+
uses: actions/checkout@v4
1717
with:
1818
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
19-
- name: Set up Node 14
20-
uses: actions/setup-node@v2-beta
19+
- name: Set up Node Stable
20+
uses: actions/setup-node@v4
2121
with:
22-
node-version: '14'
23-
- name: Set up JDK 11
24-
uses: actions/setup-java@v1
22+
node-version: '22'
23+
- name: Set up JDK 21
24+
uses: actions/setup-java@v4
2525
with:
26-
java-version: 11
27-
- name: Cache SonarQube packages
28-
uses: actions/cache@v1
29-
with:
30-
path: ~/.sonar/cache
31-
key: ${{ runner.os }}-sonar
32-
restore-keys: ${{ runner.os }}-sonar
26+
distribution: 'temurin' # See 'Supported distributions' for available options
27+
java-version: 21
3328
- name: Cache Gradle packages
34-
uses: actions/cache@v1
29+
uses: actions/cache@v4
3530
with:
3631
path: ~/.gradle/caches
3732
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
3833
restore-keys: ${{ runner.os }}-gradle
3934
- name: Validate Gradle wrapper
4035
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
41-
- name: Build with Gradle
42-
uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
43-
with:
44-
arguments: assemble
4536
- name: Gradle runs tests
4637
uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
4738
with:
4839
arguments: check
49-
# - name: Do SonarQube checks
50-
# uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
51-
# with:
52-
# arguments: sonarqube --info
53-
# env:
54-
# GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
55-
# SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
56-
# SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
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+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
with:
18+
fetch-depth: 0
19+
- name: Set up Node Stable
20+
uses: actions/setup-node@v4
21+
with:
22+
node-version: '22'
23+
- name: Set up GraalVM 21
24+
uses: graalvm/[email protected]
25+
with:
26+
distribution: 'graalvm'
27+
java-version: '21'
28+
- name: Cache Gradle packages
29+
uses: actions/cache@v4
30+
with:
31+
path: ~/.gradle/caches
32+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
33+
restore-keys: ${{ runner.os }}-gradle
34+
- name: Validate Gradle wrapper
35+
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
36+
- name: Gradle runs tests
37+
uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
38+
with:
39+
arguments: nativeTest

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

Lines changed: 28 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ on:
33
push:
44
branches:
55
- "master"
6-
76
env:
87
PROJECT_ID: ${{ secrets.RUN_PROJECT }}
98
RUN_REGION: us-central1
109
SERVICE_NAME: checkins-master
10+
TARGET_URL: https://checkins.objectcomputing.com
1111
jobs:
1212
build:
1313
runs-on: ubuntu-latest
@@ -16,61 +16,49 @@ jobs:
1616
packages: write
1717
environment:
1818
name: Production
19-
url: https://checkins.objectcomputing.com/
19+
url: ${{ env.TARGET_URL }}
2020
steps:
21-
- uses: actions/checkout@v2
21+
- uses: actions/checkout@v4
2222
with:
2323
fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis
24-
- name: Set up Node 14
25-
uses: actions/setup-node@v2-beta
24+
- name: Set up Node LTS
25+
uses: actions/setup-node@v4
2626
with:
27-
node-version: '14'
28-
- name: Set up JDK 11
29-
uses: actions/setup-java@v1
27+
node-version: '22'
28+
- name: Set up JDK 21
29+
uses: actions/setup-java@v4
3030
with:
31-
java-version: 11
31+
distribution: 'temurin' # See 'Supported distributions' for available options
32+
java-version: 21
3233
- name: Cache Gradle packages
33-
uses: actions/cache@v1
34+
uses: actions/cache@v4
3435
with:
3536
path: ~/.gradle/caches
3637
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
3738
restore-keys: ${{ runner.os }}-gradle
38-
- name: Validate Gradle wrapper
39-
uses: gradle/wrapper-validation-action@e6e38bacfdf1a337459f332974bb2327a31aaf4b
40-
- name: Build with Gradle
41-
uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
39+
- name: Setup Gradle
40+
uses: gradle/actions/setup-gradle@v4
41+
- id: 'auth'
42+
uses: 'google-github-actions/auth@v2'
4243
with:
43-
arguments: assemble
44-
env:
45-
REACT_APP_API_URL: https://checkins.objectcomputing.com
46-
# - name: Publish package
47-
# uses: gradle/gradle-build-action@4137be6a8bf7d7133955359dbd952c0ca73b1021
48-
# with:
49-
# arguments: publish
50-
# env:
51-
# GITHUB_TOKEN: ${{ secrets.GIT_HUB_TOKEN }}
52-
- name: Setup python
53-
run: |
54-
sudo apt-get install python2.7
55-
- name: Export gcloud related env variable
56-
run: export CLOUDSDK_PYTHON="/usr/bin/python2"
57-
- name: Setup gcloud CLI
58-
uses: google-github-actions/setup-gcloud@v0
44+
project_id: 'oci-intern-2019'
45+
workload_identity_provider: 'projects/832140020593/locations/global/workloadIdentityPools/github/providers/my-repo'
46+
- name: 'Set up Cloud SDK'
47+
uses: google-github-actions/setup-gcloud@v2
5948
with:
60-
version: "290.0.1"
61-
service_account_key: ${{ secrets.RUN_SA_KEY }}
62-
project_id: ${{ secrets.RUN_PROJECT }}
63-
- name: Auth Configure Docker
49+
version: '>= 363.0.0'
50+
- name: 'Auth Configure Docker'
6451
run: |-
6552
gcloud --quiet auth configure-docker
6653
- name: Build the Docker image
6754
run: |-
55+
./gradlew assemble
6856
cd server
6957
docker build --tag "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA" .
58+
env:
59+
VITE_APP_API_URL: ${{ env.TARGET_URL }}
7060
- name: Push the Docker image to Google Container Registry
71-
run: |-
72-
cd server
73-
docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
61+
run: docker push "gcr.io/$PROJECT_ID/$SERVICE_NAME:$GITHUB_SHA"
7462
- name: Deploy image to Cloud Run
7563
run: |-
7664
gcloud run deploy "$SERVICE_NAME" \
@@ -88,23 +76,15 @@ jobs:
8876
--set-env-vars "OAUTH_CLIENT_SECRET=${{ secrets.OAUTH_CLIENT_SECRET }}" \
8977
--set-env-vars "OAUTH_CALLBACK_URI"=${{ secrets.OAUTH_CALLBACK_URI }} \
9078
--set-env-vars "DIRECTORY_ID=${{ secrets.DIRECTORY_ID }}" \
91-
--set-env-vars "TYPE=${{ secrets.SA_KEY_TYPE }}" \
92-
--set-env-vars "PROJECT_ID=${{ secrets.RUN_PROJECT }}" \
93-
--set-env-vars "PRIVATE_KEY_ID=${{ secrets.SA_PRIVATE_KEY_ID }}" \
94-
--set-env-vars "PRIVATE_KEY=${{ secrets.SA_PRIVATE_KEY }}" \
95-
--set-env-vars "CLIENT_EMAIL=${{ secrets.SA_CLIENT_EMAIL }}" \
96-
--set-env-vars "CLIENT_ID=${{ secrets.SA_CLIENT_ID }}" \
97-
--set-env-vars "AUTH_URI=${{ secrets.SA_AUTH_URI }}" \
98-
--set-env-vars "TOKEN_URI=${{ secrets.SA_TOKEN_URI }}" \
99-
--set-env-vars "AUTH_PROVIDER_X509_CERT_URL=${{ secrets.SA_AUTH_PROVIDER_X509_CERT_URL }}" \
100-
--set-env-vars "CLIENT_X509_CERT_URL=${{ secrets.SA_CLIENT_X509_CERT_URL }}" \
79+
--set-env-vars "SERVICE_ACCOUNT_CREDENTIALS=${{ secrets.SERVICE_ACCOUNT_CREDENTIALS }}" \
10180
--set-env-vars "GSUITE_SUPER_ADMIN=${{ secrets.GSUITE_SUPER_ADMIN }}" \
10281
--set-env-vars "MJ_APIKEY_PUBLIC=${{ secrets.MJ_APIKEY_PUBLIC }}" \
10382
--set-env-vars "MJ_APIKEY_PRIVATE=${{ secrets.MJ_APIKEY_PRIVATE }}" \
10483
--set-env-vars "GIT_HUB_TOKEN=${{ secrets.GIT_HUB_TOKEN }}" \
105-
--set-env-vars "WEB_ADDRESS=https://checkins.objectcomputing.com" \
84+
--set-env-vars "WEB_ADDRESS=${{ env.TARGET_URL }}" \
10685
--set-env-vars "[email protected]" \
10786
--set-env-vars "FROM_NAME=Check-Ins" \
87+
--set-env-vars "^@^MICRONAUT_ENVIRONMENTS=cloud,google,gcp" \
10888
--platform "managed" \
10989
--max-instances 5 \
11090
--allow-unauthenticated

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,17 @@ jobs:
1010
packages: write
1111
steps:
1212
- uses: actions/checkout@v4
13-
- name: Set up Node 14
13+
- name: Set up Node Stable
1414
uses: actions/setup-node@v2-beta
1515
with:
16-
node-version: '14'
17-
- name: Set up JDK 11
18-
uses: actions/setup-java@v1
16+
node-version: '22'
17+
- name: Set up JDK 21
18+
uses: actions/setup-java@v4
1919
with:
20-
java-version: 11
20+
distribution: 'temurin' # See 'Supported distributions' for available options
21+
java-version: 21
2122
- name: Cache Gradle packages
22-
uses: actions/cache@v1
23+
uses: actions/cache@v4
2324
with:
2425
path: ~/.gradle/caches
2526
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
@@ -31,5 +32,5 @@ jobs:
3132
with:
3233
arguments: publish
3334
env:
34-
REACT_APP_API_URL: https://checkins.objectcomputing.com
35+
VITE_APP_API_URL: https://checkins.objectcomputing.com
3536
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Gradle Dependency Submission
2+
3+
on:
4+
push:
5+
branches: [ 'develop', 'master', 'feature-2532/graal' ]
6+
7+
permissions:
8+
contents: write
9+
10+
jobs:
11+
dependency-submission:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- name: Checkout sources
15+
uses: actions/checkout@v4
16+
- name: Setup Java
17+
uses: actions/setup-java@v4
18+
with:
19+
distribution: 'temurin'
20+
java-version: 21
21+
- name: Generate and submit dependency graph
22+
uses: gradle/actions/dependency-submission@v4

0 commit comments

Comments
 (0)