Merge pull request #13 from Opetushallitus/oidc-arm64-build

update action, 3rd party versions, add common deploy
Opetushallitus · Mar 12, 2024 · 2c0a8ed · 2c0a8ed
2 parents 27477f2 + c71d6ca
commit 2c0a8ed
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 35 deletions.
diff --git a/.github/actions/prepare-clojure-env/action.yml b/.github/actions/prepare-clojure-env/action.yml
@@ -10,6 +10,7 @@ runs:
         key: ${{ runner.os }}-maven-${{ hashFiles('**/project.clj') }}
         restore-keys: |
           ${{ runner.os }}-maven-
+
     - name: Set up JDK 21
       uses: actions/setup-java@v2
       with:
@@ -21,6 +22,6 @@ runs:
         timezoneLinux: "Europe/Helsinki"
 
     - name: Install clojure tools
-      uses: DeLaGuardo/setup-clojure@4.0
+      uses: DeLaGuardo/setup-clojure@12.5
       with:
         lein: 2.9.1
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -6,13 +6,17 @@ on:
     paths-ignore:
       - '**.md'
 
+permissions:
+  id-token: write
+  contents: read
+
 jobs:
   test-and-build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
-      - uses: dcodeIO/setup-node-nvm@master
+      - uses: actions/setup-node@v4
         with:
           node-version: lts/*
 
@@ -21,8 +25,6 @@ jobs:
 
       - name: Run tests and build uberjar
         env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
           ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
           GA_BUILD_NUMBER: ${{ github.run_number }}
@@ -34,40 +36,19 @@ jobs:
           ./bin/cibuild.sh run-all-tests-and-create-uberjar
           bin/lein with-profile prod uberjar
 
-      - uses: actions/cache@v2
+      - uses: actions/cache@v4
         id: restore-build
         with:
           path: target
           key: ${{ github.sha }}
 
   deploy-container:
     needs: [ test-and-build ]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - uses: actions/cache@v2
-        id: restore-build
-        with:
-          path: target
-          key: ${{ github.sha }}
-
-      - name: Deploy Docker containers
-        shell: bash
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          ARTIFACTORY_USERNAME: ${{ secrets.ARTIFACTORY_USERNAME }}
-          ARTIFACTORY_PASSWORD: ${{ secrets.ARTIFACTORY_PASSWORD }}
-          GA_BUILD_NUMBER: ${{ github.run_number }}
-        run: |
-          git clone https://github.com/Opetushallitus/ci-tools.git
-          source ci-tools/common/setup-tools.sh
-
-          export BASE_IMAGE="baseimage-fatjar-openjdk21:master"
-          ./ci-tools/common/pull-image.sh
-          cp -v ./target/maksut.jar $DOCKER_BUILD_DIR/artifact/maksut.jar 
-          cp -vr ./oph-configuration $DOCKER_BUILD_DIR/config/ 
-          ./ci-tools/github-build/build-fatjar.sh maksut
-          ./ci-tools/github-build/upload-image.sh maksut
-          ./ci-tools/common/clean-docker-build-dir.sh
+    uses: Opetushallitus/.github/.github/workflows/push-scan-java-ecr.yml@main
+    with:
+      application: maksut
+      base-image: baseimage-fatjar-openjdk21:master
+      configfolder: oph-configuration
+      jarfile: maksut.jar
+    secrets:
+      AWS_UTILITY_ROLE_ARN: ${{ secrets.AWS_OPH_UTILITY_ROLE_ARN }}