Merge remote-tracking branch 'refs/remotes/origin/master' into develop

# Conflicts: # .github/workflows/build-pipeline.yml # CHANGELOG.md # maap/maap.py # poetry.lock # pyproject.toml
MAAP-Project · Aug 28, 2024 · fc3de2b · fc3de2b
2 parents a83e389 + d3ffa47
commit fc3de2b
Show file tree

Hide file tree

Showing 4 changed files with 382 additions and 343 deletions.
diff --git a/.github/workflows/build-pipeline.yml b/.github/workflows/build-pipeline.yml
@@ -4,7 +4,7 @@ name: Build
 on:
   # Triggers the workflow on push events
   push:
-    branches: [ develop, release/**, main, feature/**, issue/**, issues/**, dependabot/** ]
+    branches: [ develop, release/**, main, master, feature/**, issue/**, issues/**, dependabot/** ]
     tags-ignore:
       - '*'
     # Do not trigger build if pyproject.toml was the only thing changed
@@ -75,6 +75,7 @@ jobs:
         if: |
           github.ref != 'refs/heads/develop' &&
           github.ref != 'refs/heads/main' &&
+          github.ref != 'refs/heads/master' &&
           !startsWith(github.ref, 'refs/heads/release/')
         run: |
           new_ver="${{ steps.get-version.outputs.current_version }}+$(git rev-parse --short ${GITHUB_SHA})"
@@ -105,7 +106,7 @@ jobs:
       - name: Release version
         # If triggered by push to the main branch
         if: |
-          startsWith(github.ref, 'refs/heads/main') &&
+          (startsWith(github.ref, 'refs/heads/main') || startsWith(github.ref, 'refs/heads/master')) &&
           github.event_name != 'workflow_dispatch'
         id: release
         env:
@@ -179,8 +180,8 @@ jobs:
         run: |
           git config user.name "${GITHUB_ACTOR}"
           git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
-          git tag -a "${{ env.software_version }}" -m "Version ${{ env.software_version }}"
-          git push origin "${{ env.software_version }}"
+          git tag -a "v${{ env.software_version }}" -m "Version ${{ env.software_version }}"
+          git push origin "v${{ env.software_version }}"
       - name: Create GH release
         if: |
           steps.alpha.conclusion == 'success'   ||
@@ -189,9 +190,9 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           generateReleaseNotes: true
-          name: ${{ env.software_version }}
+          name: v${{ env.software_version }}
           prerelease: ${{ steps.alpha.conclusion == 'success' || steps.rc.conclusion == 'success'}}
-          tag: ${{ env.software_version }}
+          tag: v${{ env.software_version }}
 
   publish-pypi:
     needs: [ build ]
@@ -202,7 +203,8 @@ jobs:
     if: |
       github.ref == 'refs/heads/develop' ||
       startsWith(github.ref, 'refs/heads/release') ||
-      github.ref == 'refs/heads/main'
+      github.ref == 'refs/heads/main' ||
+      github.ref == 'refs/heads/master'
     steps:
       - name: Download python dist
         uses: actions/download-artifact@v4
@@ -219,6 +221,7 @@ jobs:
           repository-url: https://test.pypi.org/legacy/
       - name: Publish to pypi.org
         if: |
-          github.ref == 'refs/heads/main'
+          github.ref == 'refs/heads/main' ||
+          github.ref == 'refs/heads/master'
         id: pypi-publish
         uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,16 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-- [issues/95](https://github.com/MAAP-Project/maap-py/issues/95): Added github action workflow for publishing
 ### Changed
 ### Deprecated
 ### Removed
 ### Fixed
 ### Security
 
+## [4.0.1]
+### Added
+- [issues/95](https://github.com/MAAP-Project/maap-py/issues/95): Added github action workflow for publishing and switched to poetry for builds
+
 ## [4.0.0]
 ### Added
 - Started tracking changelog
 
-[Unreleased]: https://github.com/MAAP-Project/maap-py/compare/v4.0.0...HEAD
+[Unreleased]: https://github.com/MAAP-Project/maap-py/compare/v4.0.1...develop
+[4.0.1]: https://github.com/MAAP-Project/maap-py/compare/v4.0.0...v4.0.1
 [4.0.0]: https://github.com/MAAP-Project/maap-py/compare/1cd11b6e05781d757b8bad7e6e899855ce3e3682...v4.0.0