diff --git a/.github/actions/update_antora/action.yaml b/.github/actions/update_antora/action.yaml index f065102ea..31a22b2c8 100644 --- a/.github/actions/update_antora/action.yaml +++ b/.github/actions/update_antora/action.yaml @@ -31,7 +31,7 @@ runs: git config --global user.email "aissemble@bah.com" git config --global user.name "aiSSEMBLE Team" git diff - git add . + git add docs/antora.yml docs/modules/ROOT/attachments/ git commit -S -m "Updating Antora documentation for version ${{ inputs.version }}" git push origin HEAD:${{ inputs.release-branch }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 71c3b88be..7e59313ba 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -83,17 +83,6 @@ jobs: release-branch: ${{ steps.split_version.outputs.release-branch }} custom-facet-old-version: ${{ steps.split_version.outputs.existing-version }} custom-facet-new-version: ${{ env.RELEASE_VERSION }} - - name: Install dependencies - uses: ./.github/actions/install_dependencies - with: - docker-username: ${{ secrets.DOCKERHUB_USERNAME }} - docker-token: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Create settings.xml - run: | - echo "ossrh${{ secrets.SONATYPE_CENTRAL_REPO_TOKEN_USER }}${{ secrets.SONATYPE_CENTRAL_REPO_TOKEN_KEY }}ghcr.io${{ secrets.GHCR_IO_USERNAME }}${{ secrets.GHCR_IO_TOKEN }}pypi${{ secrets.PYPI_USERNAME }}${{ secrets.PYPI_TOKEN }}" > $HOME/.m2/settings.xml - - name: Release aiSSEMBLE - run: | - ./mvnw release:clean release:prepare release:perform -s $HOME/.m2/settings.xml -U -B -Pci,gh-build -DdryRun=true -DpushChanges=true -DreleaseVersion=${{ env.RELEASE_VERSION }} -DdevelopmentVersion=${{ env.NEXT_DEVELOPMENT_VERSION }} -Dgpg.keyname=aissemble@bah.com -DsignTag=true -Dmaven.build.cache.enabled=false - name: Split version id: split_version_development uses: ./.github/actions/split_version @@ -109,4 +98,15 @@ jobs: release-branch: ${{ steps.split_version.outputs.release-branch }} custom-facet-old-version: ${{ env.RELEASE_VERSION }} custom-facet-new-version: ${{ env.NEXT_DEVELOPMENT_VERSION }} + - name: Install dependencies + uses: ./.github/actions/install_dependencies + with: + docker-username: ${{ secrets.DOCKERHUB_USERNAME }} + docker-token: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Create settings.xml + run: | + echo "ossrh${{ secrets.SONATYPE_CENTRAL_REPO_TOKEN_USER }}${{ secrets.SONATYPE_CENTRAL_REPO_TOKEN_KEY }}ghcr.io${{ secrets.GHCR_IO_USERNAME }}${{ secrets.GHCR_IO_TOKEN }}pypi${{ secrets.PYPI_USERNAME }}${{ secrets.PYPI_TOKEN }}" > $HOME/.m2/settings.xml + - name: Release aiSSEMBLE + run: | + ./mvnw release:clean release:prepare release:perform -s $HOME/.m2/settings.xml -U -B -Pci,gh-build -DdryRun=true -DpushChanges=true -DreleaseVersion=${{ env.RELEASE_VERSION }} -DdevelopmentVersion=${{ env.NEXT_DEVELOPMENT_VERSION }} -Dgpg.keyname=aissemble@bah.com -DsignTag=true -Dmaven.build.cache.enabled=false