OK-735: Lisätään artifactory username ja password settingsiin

Opetushallitus · Nov 26, 2024 · f51fc65 · f51fc65
1 parent e7d05ca
commit f51fc65
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 11 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,31 +9,42 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
+
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v2
+
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
 
       - name: Set up JDK 21
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v2
         with:
           java-version: '21'
           distribution: 'corretto'
           cache: 'maven'
 
+      - uses: szenius/[email protected]
+        with:
+          timezoneLinux: "Europe/Helsinki"
+
       - name: Build with Maven
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          GITHUB_TOKEN: ${{ github.token }}
         run: |
           cd ovara-backend
           mvn clean package -B -DskipTests
 
-      - uses: actions/cache@v3
-        id: ci-tools
-        with:
-          path: ci-tools
-          key: ${{ github.sha }}
+      # - uses: actions/cache@v3
+      #   id: ci-tools
+      #   with:
+      #     path: ci-tools
+      #     key: ${{ github.sha }}
 
 #  deploy_image:
 #    runs-on: ubuntu-latest

diff --git a/ovara-backend/settings.xml b/ovara-backend/settings.xml
@@ -1,4 +1,5 @@
 <!-- Maven settings -tiedosto CI-buildia varten, tarvitaan jotta voidaan autentikoitua Github Packages -repoon -->
+
 <settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
@@ -29,5 +30,15 @@
             <username>private-token</username>
             <password>${env.GITHUB_TOKEN}</password>
         </server>
+        <server>
+            <id>oph-sade-artifactory</id>
+            <username>${env.ARTIFACTORY_USERNAME}</username>
+            <password>${env.ARTIFACTORY_PASSWORD}</password>
+        </server>
+        <server>
+            <id>oph-nexus</id>
+            <username>${env.ARTIFACTORY_USERNAME}</username>
+            <password>${env.ARTIFACTORY_PASSWORD}</password>
+        </server>
     </servers>
 </settings>