Merge branch 'release/1.4'

bannmann · Nov 22, 2023 · c0251ff · c0251ff
2 parents af82b9c + ba5c0a4
commit c0251ff
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -8,6 +8,7 @@ on:
   pull_request:
     branches:
       - develop
+      - talos-testing/fake-develop
 
 jobs:
   build:
@@ -18,6 +19,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           fetch-depth: 0
+          lfs: true
 
       - name: Prepare directories
         run: mkdir -p /home/runner/work/_temp/_github_home/talos-m2-repository
@@ -29,33 +31,35 @@ jobs:
           key: talos-maven-repo
 
       - name: Build
-        uses: docker://incub8softwarelabs/talos:preview
+        uses: docker://incub8softwarelabs/talos:latest
         env:
-          # Talos-specific variables
-          TALOS_MAVEN_DEBUG: ${{ secrets.TALOS_MAVEN_DEBUG }}
-          TALOS_PARAMETERS: ${{ secrets.TALOS_PARAMETERS }}
-          TALOS_RELEASE_REPO_ENABLED: ${{ secrets.TALOS_RELEASE_REPO_ENABLED }}
-          TALOS_RELEASE_REPO_ID: ${{ secrets.TALOS_RELEASE_REPO_ID }}
-          TALOS_RELEASE_REPO_URL: ${{ secrets.TALOS_RELEASE_REPO_URL }}
-          TALOS_SERVER1_ID: ${{ secrets.TALOS_SERVER1_ID }}
+          # Talos-specific secrets
           TALOS_SERVER1_PASSWORD: ${{ secrets.TALOS_SERVER1_PASSWORD }}
-          TALOS_SERVER1_USERNAME: ${{ secrets.TALOS_SERVER1_USERNAME }}
-          TALOS_SERVER2_ID: ${{ secrets.TALOS_SERVER2_ID }}
           TALOS_SERVER2_PASSWORD: ${{ secrets.TALOS_SERVER2_PASSWORD }}
-          TALOS_SERVER2_USERNAME: ${{ secrets.TALOS_SERVER2_USERNAME }}
-          TALOS_SERVER3_ID: ${{ secrets.TALOS_SERVER3_ID }}
           TALOS_SERVER3_PASSWORD: ${{ secrets.TALOS_SERVER3_PASSWORD }}
-          TALOS_SERVER3_USERNAME: ${{ secrets.TALOS_SERVER3_USERNAME }}
-          TALOS_SIGNING_ENABLED: ${{ secrets.TALOS_SIGNING_ENABLED }}
           TALOS_SIGNING_KEY: ${{ secrets.TALOS_SIGNING_KEY }}
-          TALOS_SIGNING_PROFILE: ${{ secrets.TALOS_SIGNING_PROFILE }}
-          TALOS_SNAPSHOT_REPO_ENABLED: ${{ secrets.TALOS_SNAPSHOT_REPO_ENABLED }}
-          TALOS_SNAPSHOT_REPO_ID: ${{ secrets.TALOS_SNAPSHOT_REPO_ID }}
-          TALOS_SNAPSHOT_REPO_URL: ${{ secrets.TALOS_SNAPSHOT_REPO_URL }}
-          TALOS_SONAR_ENABLED: ${{ secrets.TALOS_SONAR_ENABLED }}
-          TALOS_SONAR_HOST: ${{ secrets.TALOS_SONAR_HOST }}
           TALOS_SONAR_LOGIN: ${{ secrets.TALOS_SONAR_LOGIN }}
-          TALOS_SONAR_ORGANIZATION: ${{ secrets.TALOS_SONAR_ORGANIZATION }}
+
+          # Talos-specific variables
+          TALOS_MAVEN_DEBUG: ${{ vars.TALOS_MAVEN_DEBUG }}
+          TALOS_PARAMETERS: ${{ vars.TALOS_PARAMETERS }}
+          TALOS_RELEASE_REPO_ENABLED: ${{ vars.TALOS_RELEASE_REPO_ENABLED }}
+          TALOS_RELEASE_REPO_ID: ${{ vars.TALOS_RELEASE_REPO_ID }}
+          TALOS_RELEASE_REPO_URL: ${{ vars.TALOS_RELEASE_REPO_URL }}
+          TALOS_SERVER1_ID: ${{ vars.TALOS_SERVER1_ID }}
+          TALOS_SERVER1_USERNAME: ${{ vars.TALOS_SERVER1_USERNAME }}
+          TALOS_SERVER2_ID: ${{ vars.TALOS_SERVER2_ID }}
+          TALOS_SERVER2_USERNAME: ${{ vars.TALOS_SERVER2_USERNAME }}
+          TALOS_SERVER3_ID: ${{ vars.TALOS_SERVER3_ID }}
+          TALOS_SERVER3_USERNAME: ${{ vars.TALOS_SERVER3_USERNAME }}
+          TALOS_SIGNING_ENABLED: ${{ vars.TALOS_SIGNING_ENABLED }}
+          TALOS_SIGNING_PROFILE: ${{ vars.TALOS_SIGNING_PROFILE }}
+          TALOS_SNAPSHOT_REPO_ENABLED: ${{ vars.TALOS_SNAPSHOT_REPO_ENABLED }}
+          TALOS_SNAPSHOT_REPO_ID: ${{ vars.TALOS_SNAPSHOT_REPO_ID }}
+          TALOS_SNAPSHOT_REPO_URL: ${{ vars.TALOS_SNAPSHOT_REPO_URL }}
+          TALOS_SONAR_ENABLED: ${{ vars.TALOS_SONAR_ENABLED }}
+          TALOS_SONAR_HOST: ${{ vars.TALOS_SONAR_HOST }}
+          TALOS_SONAR_ORGANIZATION: ${{ vars.TALOS_SONAR_ORGANIZATION }}
 
           # Token to use when SonarScanner invokes Github APIs
           # https://docs.github.com/en/actions/reference/authentication-in-a-workflow#about-the-github_token-secret

diff --git a/pom.xml b/pom.xml
@@ -2,9 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>com.github.bannmann</groupId>
+    <groupId>dev.bannmann</groupId>
     <artifactId>base</artifactId>
-    <version>1.3</version>
+    <version>1.4</version>
     <packaging>pom</packaging>
 
     <name>${project.groupId}:${project.artifactId}</name>
@@ -35,7 +35,7 @@
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
-            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
     </distributionManagement>
 
@@ -265,11 +265,11 @@
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
                     <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.8</version>
+                    <version>1.6.13</version>
                     <extensions>true</extensions>
                     <configuration>
                         <serverId>ossrh</serverId>
-                        <nexusUrl>https://oss.sonatype.org/</nexusUrl>
+                        <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
                         <autoReleaseAfterClose>true</autoReleaseAfterClose>
                     </configuration>
                 </plugin>