Updating to handle github dist (#1)

emergentdotorg · Nov 26, 2024 · d5bdf25 · d5bdf25
1 parent 1e57996
commit d5bdf25
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 13 deletions.
diff --git a/.github/workflows/maven-release.yml → .github/workflows/maven-release.yaml b/.github/workflows/maven-release.yml → .github/workflows/maven-release.yaml
@@ -3,6 +3,14 @@ name: Maven Release
 on:
   workflow_dispatch:
     inputs:
+      server-id:
+        description: 'Distribution server-id'
+        type: choice
+        required: false
+        default: central
+        options:
+          - central
+          - github
       dry-run:
         description: 'Dry-run without commits or deploys'
         type: boolean
@@ -11,10 +19,11 @@ on:
 
 jobs:
   invoke-release:
-    uses: emergentdotorg/github-actions/.github/workflows/reusable-maven-release.yml@main
+    uses: emergentdotorg/github-actions/.github/workflows/maven-release.yaml@v1
     secrets: inherit
     with:
       java-version: '8'
+      server-id: ${{ inputs.server-id }}
       dry-run: ${{ inputs.dry-run }}
 
   process-results:

diff --git a/.github/workflows/maven-tests.yml → .github/workflows/maven-verify.yaml b/.github/workflows/maven-tests.yml → .github/workflows/maven-verify.yaml
@@ -1,4 +1,4 @@
-name: Maven Tests
+name: Maven Verify
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -12,7 +12,7 @@ on:
 
 jobs:
   build:
-    uses: emergentdotorg/github-actions/.github/workflows/reusable-maven-tests.yml@main
+    uses: emergentdotorg/github-actions/.github/workflows/maven-verify.yaml@v1
     secrets: inherit
     with:
       java-version: '8'
diff --git a/pom.xml b/pom.xml
@@ -48,6 +48,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <surefire.version>3.3.0</surefire.version>
+    <version.central-publishing-maven-plugin>0.6.0</version.central-publishing-maven-plugin>
     <version.maven-antrun-plugin>3.1.0</version.maven-antrun-plugin>
     <version.maven-assembly-plugin>3.7.1</version.maven-assembly-plugin>
     <version.maven-clean-plugin>3.4.0</version.maven-clean-plugin>
@@ -219,15 +220,36 @@
           <artifactId>maven-shade-plugin</artifactId>
           <version>${version.maven-shade-plugin}</version>
         </plugin>
+        <plugin>
+          <groupId>org.sonatype.central</groupId>
+          <artifactId>central-publishing-maven-plugin</artifactId>
+          <version>${version.central-publishing-maven-plugin}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
 
   <profiles>
+    <profile>
+      <id>central-dist</id>
+      <activation>
+        <property>
+          <name>!altDeploymentRepository</name>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.sonatype.central</groupId>
+            <artifactId>central-publishing-maven-plugin</artifactId>
+            <extensions>true</extensions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
     <profile>
       <id>emergent-release</id>
       <properties>
-        <distMgmtReleasesId>central</distMgmtReleasesId>
         <minimalJavaBuildVersion>${maven.compiler.target}</minimalJavaBuildVersion>
         <minimalMavenBuildVersion>3.6.3</minimalMavenBuildVersion>
         <assembly.tarLongFileMode>posix</assembly.tarLongFileMode>
@@ -334,15 +356,6 @@
               <releaseProfiles>emergent-release</releaseProfiles>
             </configuration>
           </plugin>
-          <plugin>
-            <groupId>org.sonatype.central</groupId>
-            <artifactId>central-publishing-maven-plugin</artifactId>
-            <version>0.6.0</version>
-            <extensions>true</extensions>
-            <configuration>
-              <publishingServerId>${distMgmtReleasesId}</publishingServerId>
-            </configuration>
-          </plugin>
         </plugins>
       </build>
     </profile>