285 - test pypi deploy

boozallen · Aug 26, 2024 · 61cdc13 · 61cdc13
1 parent a8df641
commit 61cdc13
Showing 1 changed file with 3 additions and 18 deletions.
diff --git a/.github/workflows/build2.yml b/.github/workflows/build2.yml
@@ -87,32 +87,17 @@ jobs:
           distribution: 'temurin'
       - name: Create Docker Builder Config File
         run: sudo touch /etc/buildkitd.toml
-      # Run build with the gh-build profile
+      # Generate the settings.xml for ghcr.io, pypi, & dev-pypi server profiles
       - name: Create settings.xml
         run: |
-          echo "<settings><servers><server><id>ghcr.io</id><username>d-ryan-ashcraft</username><password>${{ secrets.GHCR_IO_TOKEN }}</password></server><server><id>pypi</id><username>${{ secrets.PYPI_USENAME }}</username><password>${{ secrets.PYPI_TOKEN }}</password></server><server><id>dev-pypi</id><username>__token__</username><password>${{ secrets.TEST_PYPI_TOKEN }}</password></server> </servers></settings>" > $HOME/.m2/settings.xml
+          echo "<settings><servers><server><id>ghcr.io</id><username>d-ryan-ashcraft</username><password>${{ secrets.GHCR_IO_TOKEN }}</password></server><server><id>pypi</id><username>${{ secrets.PYPI_USENAME }}</username><password>${{ secrets.PYPI_TOKEN }}</password></server><server><id>dev-pypi</id><username>${{ secrets.TEST_PYPI_USENAME }}</username><password>${{ secrets.TEST_PYPI_TOKEN }}</password></server> </servers></settings>" > $HOME/.m2/settings.xml
+      # Run build with the gh-build profile
       - name: Build aiSSEMBLE
         run: |
           docker login registry-1.docker.io/v1 -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }}
           echo "CHECKING SETTINGS.XML"
           cat $HOME/.m2/settings.xml
           ./mvnw -B clean deploy -U -f pom.xml -Pci,gh-build --settings $HOME/.m2/settings.xml
-#          echo "<settings><servers><server><id>ghcr.io</id><username>d-ryan-ashcraft</username><password>${{ secrets.GHCR_IO_TOKEN }}</password></server><server><id>pypi</id><username>foo</username><password>bar</password></server><server><id>dev-pypi</id><username>${{ secrets.TEST_PYPI_USENAME }}</username><password>${{ secrets.TEST_PYPI_TOKEN }}</password></server> </servers></settings>" > $HOME/.m2/settings.xml
-      #          ./mvnw -B clean deploy -U -f extensions/extensions-docker -Pgh-build --settings $HOME/.m2/settings.xml
-      #          ./mvnw -B clean install -U --file pom.xml -Pci,integration-test,gh-build
-      #NB: The following two explicit cache saves are necessary to ensure caches are saved on build failure,
-      # until https://github.com/actions/cache/issues/1315 is resolved
-
-#      - name: Create settings.xml
-#        run: |
-#          echo "<settings><servers><server><id>ghcr.io</id><username>d-ryan-ashcraft</username><password>${{ secrets.GHCR_IO_TOKEN }}</password></server><server><id>pypi</id><username>${{ secrets.PYPI_USENAME }}</username><password>${{ secrets.PYPI_TOKEN }}</password></server><server><id>test-pypi</id><username>${{ secrets.TEST_PYPI_USENAME }}</username><password>${{ secrets.TEST_PYPI_TOKEN }}</password></server></servers></settings>" > $HOME/.m2/settings.xml
-#      - name: Build aiSSEMBLE
-#        run: |
-#          docker login registry-1.docker.io/v1 -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_TOKEN }}
-##          ./mvnw -B clean deploy -U -f pom.xml -Pgh-build --settings $HOME/.m2/settings.xml
-##          ./mvnw -B clean deploy -U -f extensions/extensions-docker -Pgh-build --settings $HOME/.m2/settings.xml
-#          ./mvnw -B clean install -U --file pom.xml -Pgh-build
-##          ./mvnw -B clean install -U --file pom.xml -Pci,integration-test,gh-build
 #      #NB: The following two explicit cache saves are necessary to ensure caches are saved on build failure,
 #      # until https://github.com/actions/cache/issues/1315 is resolved
       - name: Save m2 repository cache