From b0adfbb0e930dbe5df5a6478b761e1999bf5913f Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Tue, 23 Feb 2021 21:05:04 +0100 Subject: [PATCH 1/6] =?UTF-8?q?[gitflow]=C2=A0Update=20for=20next=20develo?= =?UTF-8?q?pment=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 19a85f8..b4b998b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.github.bannmann base - 1.3-SNAPSHOT + 1.4-SNAPSHOT pom ${project.groupId}:${project.artifactId} From 4f051634b29daad355f572aa47d364950bd05ed5 Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Tue, 23 Feb 2021 21:07:59 +0100 Subject: [PATCH 2/6] =?UTF-8?q?[gitflow]=C2=A0Update=20develop=20to=20prod?= =?UTF-8?q?uction=20version=20to=20avoid=20merge=20conflicts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b4b998b..5677a81 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.github.bannmann base - 1.4-SNAPSHOT + 1.3 pom ${project.groupId}:${project.artifactId} From c74ae5b3146ed45478a2fcfa6c3c0bd2f3d668ff Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Tue, 23 Feb 2021 21:08:02 +0100 Subject: [PATCH 3/6] =?UTF-8?q?[gitflow]=C2=A0Update=20develop=20version?= =?UTF-8?q?=20back=20to=20pre-merge=20state?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5677a81..b4b998b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.github.bannmann base - 1.3 + 1.4-SNAPSHOT pom ${project.groupId}:${project.artifactId} From 94605ab04c88d45f8518ddfd3d8834861287f03e Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Wed, 22 Nov 2023 18:40:12 +0100 Subject: [PATCH 4/6] Upgrade Talos and start using Actions variables --- .github/workflows/build.yml | 46 ++++++++++++++++++++----------------- 1 file changed, 25 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index da5fa7d..666e18f 100644 --- 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 From 79b192656898da800bc3f212a96ed5987fde37a8 Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Wed, 22 Nov 2023 18:40:58 +0100 Subject: [PATCH 5/6] Switch to new group ID, upgrade staging plugin and move to new OSSRH host --- pom.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index b4b998b..748d8ca 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.github.bannmann + dev.bannmann base 1.4-SNAPSHOT pom @@ -35,7 +35,7 @@ ossrh - https://oss.sonatype.org/content/repositories/snapshots + https://s01.oss.sonatype.org/content/repositories/snapshots @@ -265,11 +265,11 @@ org.sonatype.plugins nexus-staging-maven-plugin - 1.6.8 + 1.6.13 true ossrh - https://oss.sonatype.org/ + https://s01.oss.sonatype.org/ true From ba5c0a4bb3cfd210d469afb7b39a55ac15ecf7d6 Mon Sep 17 00:00:00 2001 From: Jens Bannmann Date: Wed, 22 Nov 2023 18:44:15 +0100 Subject: [PATCH 6/6] =?UTF-8?q?[gitflow]=C2=A0Update=20for=20next=20develo?= =?UTF-8?q?pment=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 748d8ca..5c3d5ef 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ dev.bannmann base - 1.4-SNAPSHOT + 1.4 pom ${project.groupId}:${project.artifactId}