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

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

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -22,18 +22,30 @@ jobs:
           distribution: 'corretto'
           cache: 'maven'
 
+      - 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-
+
+      - uses: szenius/[email protected]
+        with:
+          timezoneLinux: "Europe/Helsinki"
+
       - name: Build with Maven
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_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
@@ -29,5 +29,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>