Skip to content

feat: auto increase version + update Changelog #224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 30 commits into from
Oct 2, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
26bd530
pr merge testing
wphyojpl Sep 21, 2023
b8219d8
using existing workflow
wphyojpl Sep 21, 2023
f09bd59
Merge pull request #208 from unity-sds/git-hook
wphyojpl Sep 21, 2023
1f7d678
next step
wphyojpl Sep 21, 2023
69cb24d
next step (#209)
wphyojpl Sep 21, 2023
2dbb38d
python bug
wphyojpl Sep 21, 2023
35a3a1b
Merge branch 'develop-temp' into git-hook
wphyojpl Sep 21, 2023
773b5aa
chore: dummy commit
wphyojpl Sep 21, 2023
d242b67
Merge pull request #210 from unity-sds/git-hook
wphyojpl Sep 21, 2023
09120d9
fix: add debug statement (#211)
wphyojpl Sep 21, 2023
dbb7182
fix: still fixing env bug (#212)
wphyojpl Sep 21, 2023
fe0aebd
fix: cannot use >> in yaml (#213)
wphyojpl Sep 21, 2023
5a33b38
fix: yaml format error (#214)
wphyojpl Sep 21, 2023
b0c249f
fix: yaml error still (#215)
wphyojpl Sep 21, 2023
97d719c
fix: still yaml error (#216)
wphyojpl Sep 21, 2023
27dae93
fix: env bug now (#217)
wphyojpl Sep 21, 2023
4795fae
feat: merge version update to git (#218)
wphyojpl Sep 21, 2023
69bb50a
fix: git bot user to push changes (#219)
wphyojpl Sep 21, 2023
13cfee6
chore: update version + change log
github-actions[bot] Sep 21, 2023
733d906
fix:version increment does not work directly (#220)
wphyojpl Sep 21, 2023
d89d1ac
chore: update version + change log
github-actions[bot] Sep 21, 2023
b8d2441
fix: remove print statements (#221)
wphyojpl Sep 21, 2023
94538fa
chore: update version + change log
github-actions[bot] Sep 21, 2023
2cb1f05
feat: wrong insertion point for changelog (#222)
wphyojpl Sep 21, 2023
1bd4ed3
chore: update version + change log
github-actions[bot] Sep 21, 2023
b2adc7e
breaking: formatting changelog file (#223)
wphyojpl Sep 21, 2023
4e1120f
chore: update version + change log
github-actions[bot] Sep 21, 2023
d6a7214
chore: reset versions
wphyojpl Sep 21, 2023
3e101f2
fix: revert some changes to keep it the same as develop
wphyojpl Sep 21, 2023
a0402a9
Merge branch 'develop' into develop-temp
wphyojpl Sep 28, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
110 changes: 110 additions & 0 deletions .github/workflows/makefile.bak.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
name: Makefile CI

on:
push:
branches: [ main, develop ]
pull_request:
branches: [ develop ]

env:
ARTIFACT_BASE_NAME: cumulus_lambda_functions
jobs:
build:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: '3.9'
- run: |
python3 "${GITHUB_WORKSPACE}/setup.py" install
- run: |
python3 "${GITHUB_WORKSPACE}/setup.py" install_lib
- run: |
# make file runnable, might not be necessary
chmod +x "${GITHUB_WORKSPACE}/ci.cd/create_aws_lambda_zip.sh"

# run script
"${GITHUB_WORKSPACE}/ci.cd/create_aws_lambda_zip.sh"
- run: |
artifact_file_name="${{ env.ARTIFACT_BASE_NAME }}-${{ env.software_version }}.zip"
terraform_artifact_file_name="terraform_${{ env.ARTIFACT_BASE_NAME }}-${{ env.software_version }}.zip"
echo "ARTIFACT_FILE=$artifact_file_name" >> $GITHUB_ENV
echo "TERRAFORM_ARTIFACT_FILE=$terraform_artifact_file_name" >> $GITHUB_ENV
cp "${GITHUB_WORKSPACE}/cumulus_lambda_functions_deployment.zip" "$artifact_file_name"
cp "${GITHUB_WORKSPACE}/terraform_cumulus_lambda_functions_deployment.zip" "$terraform_artifact_file_name"
- name: Create Release
id: create_release
if: ${{ contains(github.ref, 'master') }}
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: "v${{ env.software_version }}"
release_name: "Release v${{ env.software_version }} - ${{ github.ref }}"
body: |
Changes in this release:
${{ github.event.head_commit.message }}
body_path: release.md
draft: false
prerelease: false
- name: Create PreRelease
id: create_prerelease
# if: ${{ contains(github.ref, 'main') }}
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: "v${{ env.software_version }}"
release_name: "Release v${{ env.software_version }} - ${{ github.ref }}"
body: |
Changes in this release:
${{ github.event.head_commit.message }}
draft: false
prerelease: true
- name: Upload PreRelease Asset 1
id: upload-prerelease-asset-1
# if: ${{ contains(github.ref, 'main') }}
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_prerelease.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: "${{ env.ARTIFACT_FILE }}"
asset_name: "${{ env.ARTIFACT_FILE }}"
asset_content_type: application/zip
- name: Upload PreRelease Asset 2
id: upload-prerelease-asset-2
# if: ${{ contains(github.ref, 'main') }}
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_prerelease.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: "${{ env.TERRAFORM_ARTIFACT_FILE }}"
asset_name: "${{ env.TERRAFORM_ARTIFACT_FILE }}"
asset_content_type: application/zip
- name: Upload Release Asset 1
id: upload-release-asset-1
if: ${{ contains(github.ref, 'master') }}
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: "${{ env.ARTIFACT_FILE }}"
asset_name: "${{ env.ARTIFACT_FILE }}"
asset_content_type: application/zip
- name: Upload Release Asset 2
id: upload-release-asset-2
if: ${{ contains(github.ref, 'master') }}
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: "${{ env.TERRAFORM_ARTIFACT_FILE }}"
asset_name: "${{ env.TERRAFORM_ARTIFACT_FILE }}"
asset_content_type: application/zip
101 changes: 6 additions & 95 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
@@ -1,110 +1,21 @@
name: Makefile CI

name: Build PR Merge
on:
push:
branches: [ main, develop ]
pull_request:
branches: [ develop ]
types: [closed]

env:
ARTIFACT_BASE_NAME: cumulus_lambda_functions
jobs:
build:

if: github.event.pull_request.merged == true
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: '3.9'
- run: |
python3 "${GITHUB_WORKSPACE}/setup.py" install
- run: |
python3 "${GITHUB_WORKSPACE}/setup.py" install_lib
- run: |
# make file runnable, might not be necessary
chmod +x "${GITHUB_WORKSPACE}/ci.cd/create_aws_lambda_zip.sh"

# run script
"${GITHUB_WORKSPACE}/ci.cd/create_aws_lambda_zip.sh"
- run: |
artifact_file_name="${{ env.ARTIFACT_BASE_NAME }}-${{ env.software_version }}.zip"
terraform_artifact_file_name="terraform_${{ env.ARTIFACT_BASE_NAME }}-${{ env.software_version }}.zip"
echo "ARTIFACT_FILE=$artifact_file_name" >> $GITHUB_ENV
echo "TERRAFORM_ARTIFACT_FILE=$terraform_artifact_file_name" >> $GITHUB_ENV
cp "${GITHUB_WORKSPACE}/cumulus_lambda_functions_deployment.zip" "$artifact_file_name"
cp "${GITHUB_WORKSPACE}/terraform_cumulus_lambda_functions_deployment.zip" "$terraform_artifact_file_name"
- name: Create Release
id: create_release
if: ${{ contains(github.ref, 'master') }}
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: "v${{ env.software_version }}"
release_name: "Release v${{ env.software_version }} - ${{ github.ref }}"
body: |
Changes in this release:
${{ github.event.head_commit.message }}
body_path: release.md
draft: false
prerelease: false
- name: Create PreRelease
id: create_prerelease
# if: ${{ contains(github.ref, 'main') }}
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # This token is provided by Actions, you do not need to create your own token
with:
tag_name: "v${{ env.software_version }}"
release_name: "Release v${{ env.software_version }} - ${{ github.ref }}"
body: |
Changes in this release:
${{ github.event.head_commit.message }}
draft: false
prerelease: true
- name: Upload PreRelease Asset 1
id: upload-prerelease-asset-1
# if: ${{ contains(github.ref, 'main') }}
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_prerelease.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: "${{ env.ARTIFACT_FILE }}"
asset_name: "${{ env.ARTIFACT_FILE }}"
asset_content_type: application/zip
- name: Upload PreRelease Asset 2
id: upload-prerelease-asset-2
# if: ${{ contains(github.ref, 'main') }}
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_prerelease.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: "${{ env.TERRAFORM_ARTIFACT_FILE }}"
asset_name: "${{ env.TERRAFORM_ARTIFACT_FILE }}"
asset_content_type: application/zip
- name: Upload Release Asset 1
id: upload-release-asset-1
if: ${{ contains(github.ref, 'master') }}
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: "${{ env.ARTIFACT_FILE }}"
asset_name: "${{ env.ARTIFACT_FILE }}"
asset_content_type: application/zip
- name: Upload Release Asset 2
id: upload-release-asset-2
if: ${{ contains(github.ref, 'master') }}
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: "${{ env.TERRAFORM_ARTIFACT_FILE }}"
asset_name: "${{ env.TERRAFORM_ARTIFACT_FILE }}"
asset_content_type: application/zip
PR_NUMBER="${{ github.event.number }}"
PR_TITLE="${{ github.event.pull_request.title }}"
echo "${PR_TITLE} -- ${PR_NUMBER}"
21 changes: 21 additions & 0 deletions .github/workflows/pr_merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Build PR Merge
on:
pull_request:
types: [closed]

env:
ARTIFACT_BASE_NAME: cumulus_lambda_functions
jobs:
build:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v3
with:
python-version: '3.9'
- run: |
artifact_file_name="${{ env.ARTIFACT_BASE_NAME }}-${{ env.software_version }}.zip"
PR_NUMBER="${{ github.event.number }}"
PR_TITLE="${{ github.event.pull_request.title }}"
echo "${PR_TITLE} -- ${PR_NUMBER}"