From 3c4432c4b35de43c6a33980baee4dfb70035ca86 Mon Sep 17 00:00:00 2001
From: yenes56 <eshin_yen@hotmail.com>
Date: Fri, 23 Dec 2022 12:38:39 -0800
Subject: [PATCH 1/2] Feature/podaac 5104 (#6)

* changed "main" to "master"

* upgrade actions and python version

* upgrade to poetry 1.1.15

* CHANGELOG upgrade

* change main to master, enhanced action and upgrade python/poetry versions

Co-authored-by: Yen, David (398B-Affiliate) <david.yen@jpl.nasa.gov>
---
 .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

From e402e3727cdeba10d5ff03bbd4bd662a38d56f07 Mon Sep 17 00:00:00 2001
From: concise bot <concise@noreply.github.com>
Date: Fri, 23 Dec 2022 20:39:38 +0000
Subject: [PATCH 2/2] /version 1.2.0-alpha.1

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index d4b33b5..a267b9c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "cumulus-message-adapter-passthrough"
-version = "1.2.0-alpha.0"
+version = "1.2.0-alpha.1"
 description = "A simple lambda which pass input through output"
 authors = ["PODAAC IngestAndArchive <podaac@jpl.nasa.gov>"]