From 190f032ef2f47564d13e1adc5ba9acd8c0ce10d6 Mon Sep 17 00:00:00 2001
From: Denis Yuen <denis.yuen@oicr.on.ca>
Date: Wed, 31 May 2023 16:22:20 -0400
Subject: [PATCH] test github actions release (#469)

* avoid name clash
* rename to avoid clash
* try using resuable workflow
---
 .circleci/config.yml                          |  2 +-
 .github/workflows/deploy_tagged.yml           | 51 ++-----------------
 .../pom.xml                                   |  2 +-
 pom.xml                                       |  4 +-
 4 files changed, 9 insertions(+), 50 deletions(-)
 rename {reports => dockstore-support-reports}/pom.xml (98%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c335652d..b1ad97f4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -170,7 +170,7 @@ commands:
           name: send coverage
           command: bash <(curl -s https://codecov.io/bash) -F ${DIRECTORY//-} || echo "Codecov did not collect coverage reports"
       - store_artifacts:
-          path: reports/target/site
+          path: dockstore-cli-reports/target/site
 
 
   install_dockerize:
diff --git a/.github/workflows/deploy_tagged.yml b/.github/workflows/deploy_tagged.yml
index c541d666..614cd5d6 100644
--- a/.github/workflows/deploy_tagged.yml
+++ b/.github/workflows/deploy_tagged.yml
@@ -10,49 +10,8 @@ on:
 
 
 jobs:
-  build:
-    runs-on: ubuntu-22.04
-
-    # Should only release tags
-    # TODO: should only release tags where the required status checks are passing
-    if: startsWith(github.ref, 'refs/tags/')
-
-    permissions:
-      id-token: write
-
-    steps:
-      - uses: actions/checkout@v3
-      # Step that does that actual cache save and restore
-      - uses: actions/cache@v3
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-           ${{ runner.os }}-maven-
-
-      - name: install git secrets
-        run: |
-          wget --no-verbose -O git-secrets-1.3.0.tar.gz https://github.com/awslabs/git-secrets/archive/1.3.0.tar.gz
-          tar -zxf git-secrets-1.3.0.tar.gz
-          cd git-secrets-1.3.0
-          sudo make install   
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: '17.0.4+8'
-          distribution: 'adopt'
-
-      - name: Store Maven project version 
-        run: echo "maven_project_version=$(mvn help:evaluate -Dexpression=project.version -Dchangelist=${{ github.event.inputs.changelist }} -q -DforceStdout)" >> $GITHUB_ENV
-
-      - name: Read exported variable
-        run: |
-          echo "${{ env.maven_project_version }}"
-
-      - name: Deploy with mvnw
-        run: |
-         git config --global user.email "${{ github.actor }}"
-         git config --global user.name "${{ github.actor }}"
-         ./mvnw --batch-mode deploy -ntp -s .github/collab-mvn-settings.xml -DskipTests -Dchangelist=${{ github.event.inputs.changelist }}
-        env: 
-          COLLAB_DEPLOY_TOKEN: ${{ secrets.COLLAB_DEPLOY_TOKEN }}
+  call-reusable-tagged-release:
+    uses: dockstore/workflow-actions/.github/workflows/deploy_tagged.yaml@main
+    with:
+      changelist: ${{ inputs.changelist }}
+    secrets: inherit
diff --git a/reports/pom.xml b/dockstore-support-reports/pom.xml
similarity index 98%
rename from reports/pom.xml
rename to dockstore-support-reports/pom.xml
index c7c47084..e5b1140a 100644
--- a/reports/pom.xml
+++ b/dockstore-support-reports/pom.xml
@@ -22,7 +22,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>reports</artifactId>
+    <artifactId>dockstore-support-reports</artifactId>
     <!-- do not set packaging to pom, because otherwise we will receive "Not executing Javadoc as the project is not a Java classpath-capable package" -->
 
     <dependencies>
diff --git a/pom.xml b/pom.xml
index ed67db7d..f39d30e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
         <sonar.moduleKey>${project.artifactId}</sonar.moduleKey>
         <!-- this is not an aggregated path -->
         <sonar.coverage.jacoco.xmlReportPaths>
-            ${project.basedir}/target/jacoco.xml,${project.basedir}/target/jacoco-it.xml,${project.basedir}/../reports/target/site/jacoco-aggregate/jacoco.xml
+            ${project.basedir}/target/jacoco.xml,${project.basedir}/target/jacoco-it.xml,${project.basedir}/../dockstore-support-reports/target/site/jacoco-aggregate/jacoco.xml
         </sonar.coverage.jacoco.xmlReportPaths>
         <!-- end sonarcloud properties -->
         <cwlavro.version>2.0.4.7</cwlavro.version>
@@ -125,7 +125,7 @@
         <module>metricsaggregator</module>
         <module>toolbackup</module>
         <module>tooltester</module>
-        <module>reports</module>
+        <module>dockstore-support-reports</module>
     </modules>