From 0ee3bc63b7dc89b79f3b3db30c4ea1965db0dbee Mon Sep 17 00:00:00 2001 From: "Yen, David (398B-Affiliate)" Date: Thu, 22 Dec 2022 14:54:04 -0800 Subject: [PATCH 1/5] changed "main" to "master" --- .github/workflows/build-pipeline.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-pipeline.yml b/.github/workflows/build-pipeline.yml index bfd1aa5..df3fd42 100644 --- a/.github/workflows/build-pipeline.yml +++ b/.github/workflows/build-pipeline.yml @@ -3,7 +3,7 @@ name: Build on: # Triggers the workflow on push events push: - branches: [ develop, release/**, main, feature/** ] + branches: [ develop, release/**, master, feature/** ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -62,8 +62,8 @@ jobs: echo "software_version=$(poetry version | awk '{print $2}')" >> $GITHUB_ENV echo "venue=uat" >> $GITHUB_ENV - name: Release version - # If triggered by push to the main branch - if: ${{ startsWith(github.ref, 'refs/heads/main') }} + # If triggered by push to the master branch + if: ${{ startsWith(github.ref, 'refs/heads/master') }} env: CURRENT_VERSION: ${{ steps.get-version.outputs.current_version }} # Remove -rc.* from end of version string @@ -87,10 +87,10 @@ jobs: --project-name=${{ github.repository }} - name: Commit Version Bump - # If building develop, a release branch, or main then we commit the version bump back to the repo + # If building develop, a release branch, or master then we commit the version bump back to the repo if: | github.ref == 'refs/heads/develop' || - github.ref == 'refs/heads/main' || + github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release') run: | git config --global user.name 'concise bot' @@ -101,7 +101,7 @@ jobs: uses: actions-ecosystem/action-push-tag@v1 if: | github.ref == 'refs/heads/develop' || - github.ref == 'refs/heads/main' || + github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release') with: tag: ${{ env.software_version }} From 6e9425a615b9aa426c5c31ea25e08215b15e8b07 Mon Sep 17 00:00:00 2001 From: "Yen, David (398B-Affiliate)" Date: Thu, 22 Dec 2022 14:58:37 -0800 Subject: [PATCH 2/5] upgrade actions and python version --- .github/workflows/build-pipeline.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-pipeline.yml b/.github/workflows/build-pipeline.yml index df3fd42..1801f68 100644 --- a/.github/workflows/build-pipeline.yml +++ b/.github/workflows/build-pipeline.yml @@ -20,10 +20,10 @@ jobs: runs-on: ubuntu-latest steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v3 with: - python-version: 3.6 + python-version: 3.8 - name: Install Poetry uses: abatilo/actions-poetry@v2.0.0 with: From c12a98668a3fea9aa3315491a7ebdc07d9f79896 Mon Sep 17 00:00:00 2001 From: "Yen, David (398B-Affiliate)" Date: Thu, 22 Dec 2022 15:07:19 -0800 Subject: [PATCH 3/5] upgrade to poetry 1.1.15 --- .github/workflows/build-pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-pipeline.yml b/.github/workflows/build-pipeline.yml index 1801f68..8777fdb 100644 --- a/.github/workflows/build-pipeline.yml +++ b/.github/workflows/build-pipeline.yml @@ -27,7 +27,7 @@ jobs: - name: Install Poetry uses: abatilo/actions-poetry@v2.0.0 with: - poetry-version: 1.1.4 + poetry-version: 1.1.15 - name: Get version id: get-version run: | From fe5e61f8ca194f37af832c98041a8074ab8b4bbf Mon Sep 17 00:00:00 2001 From: "Yen, David (398B-Affiliate)" Date: Thu, 22 Dec 2022 15:16:51 -0800 Subject: [PATCH 4/5] CHANGELOG upgrade --- CHANGELOG.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dc42f3..81a2066 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Added +- **PODAAC-5104** + - fixed release build + - upgrade few actions, python version to 3.8 and poetry 1.1.4 -> 1.1.15 +### Changed +### Deprecated +### Removed +### Fixed +### Security + + ## [1.1.0] ### Added From f9111da59570ecd6b977f286c5c3d1e1ad70d6b4 Mon Sep 17 00:00:00 2001 From: "Yen, David (398B-Affiliate)" Date: Thu, 22 Dec 2022 15:20:32 -0800 Subject: [PATCH 5/5] change main to master, enhanced action and upgrade python/poetry versions --- .github/workflows/build-pipeline.yml | 20 ++++++++++---------- CHANGELOG.md | 14 ++++++++++++++ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-pipeline.yml b/.github/workflows/build-pipeline.yml index bfd1aa5..8777fdb 100644 --- a/.github/workflows/build-pipeline.yml +++ b/.github/workflows/build-pipeline.yml @@ -3,7 +3,7 @@ name: Build on: # Triggers the workflow on push events push: - branches: [ develop, release/**, main, feature/** ] + branches: [ develop, release/**, master, feature/** ] # Allows you to run this workflow manually from the Actions tab workflow_dispatch: @@ -20,14 +20,14 @@ jobs: runs-on: ubuntu-latest steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - uses: actions/setup-python@v2 + - uses: actions/checkout@v3 + - uses: actions/setup-python@v3 with: - python-version: 3.6 + python-version: 3.8 - name: Install Poetry uses: abatilo/actions-poetry@v2.0.0 with: - poetry-version: 1.1.4 + poetry-version: 1.1.15 - name: Get version id: get-version run: | @@ -62,8 +62,8 @@ jobs: echo "software_version=$(poetry version | awk '{print $2}')" >> $GITHUB_ENV echo "venue=uat" >> $GITHUB_ENV - name: Release version - # If triggered by push to the main branch - if: ${{ startsWith(github.ref, 'refs/heads/main') }} + # If triggered by push to the master branch + if: ${{ startsWith(github.ref, 'refs/heads/master') }} env: CURRENT_VERSION: ${{ steps.get-version.outputs.current_version }} # Remove -rc.* from end of version string @@ -87,10 +87,10 @@ jobs: --project-name=${{ github.repository }} - name: Commit Version Bump - # If building develop, a release branch, or main then we commit the version bump back to the repo + # If building develop, a release branch, or master then we commit the version bump back to the repo if: | github.ref == 'refs/heads/develop' || - github.ref == 'refs/heads/main' || + github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release') run: | git config --global user.name 'concise bot' @@ -101,7 +101,7 @@ jobs: uses: actions-ecosystem/action-push-tag@v1 if: | github.ref == 'refs/heads/develop' || - github.ref == 'refs/heads/main' || + github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release') with: tag: ${{ env.software_version }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dc42f3..81a2066 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,20 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +## [Unreleased] + +### Added +- **PODAAC-5104** + - fixed release build + - upgrade few actions, python version to 3.8 and poetry 1.1.4 -> 1.1.15 +### Changed +### Deprecated +### Removed +### Fixed +### Security + + ## [1.1.0] ### Added