Skip to content

fix: next step #209

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 1 commit into from
Sep 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 0 additions & 110 deletions .github/workflows/makefile.bak.yml

This file was deleted.

101 changes: 95 additions & 6 deletions .github/workflows/makefile.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,110 @@
name: Build PR Merge
name: Makefile CI

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

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"
PR_NUMBER="${{ github.event.number }}"
PR_TITLE="${{ github.event.pull_request.title }}"
echo "${PR_TITLE} -- ${PR_NUMBER}"
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
2 changes: 2 additions & 0 deletions .github/workflows/pr_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ jobs:
PR_NUMBER="${{ github.event.number }}"
PR_TITLE="${{ github.event.pull_request.title }}"
echo "${PR_TITLE} -- ${PR_NUMBER}"
- run: |
python3 "${GITHUB_WORKSPACE}/ci.cd/update_setup_version.py" install
81 changes: 81 additions & 0 deletions ci.cd/update_setup_version.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
import os
import re
from datetime import datetime

os.environ['GITHUB_WORKSPACE'] = '/Users/wphyo/Projects/unity/unity-data-services'
os.environ['PR_TITLE'] = 'breaking: test1'
os.environ['PR_NUMBER'] = '342'
# PR_NUMBER: ${{ github.event.number }}
# PR_TITLE: ${{ github.event.pull_request.title }}
pr_title = os.environ.get('PR_TITLE')
pr_number = os.environ.get('PR_NUMBER')
root_dir = os.environ.get('GITHUB_WORKSPACE')
pr_title = pr_title.strip().lower()

if pr_title.startswith('breaking'):
major1, minor1, patch1 = 1, 0, 0
change_log_line = '### Added'
elif pr_title.startswith('feat'):
major1, minor1, patch1 = 1, 1, 0
change_log_line = '### Changed'
elif pr_title.startswith('fix') or pr_title.startswith('chore'): # TODO chore is bumping up version?
major1, minor1, patch1 = 1, 0, 1
change_log_line = '### Fixed'
else:
raise RuntimeError(f'invalid PR Title: {pr_title}')

def update_version():
# Specify the path to your setup.py file
setup_py_path = os.path.join(root_dir, 'setup.py')
# Define a regular expression pattern to match the version
version_pattern = r"version\s*=\s*['\"](.*?)['\"]"

# Read the contents of setup.py
with open(setup_py_path, 'r') as setup_file:
setup_contents = setup_file.read()

# Find the current version using the regular expression pattern
current_version = re.search(version_pattern, setup_contents).group(1)

# Parse the current version and increment it
major, minor, patch = map(int, current_version.split('.'))
new_version = f"{major + major1}.{minor + minor1}.{patch + patch1}"

# Replace the old version with the new version in setup.py
updated_setup_contents = re.sub(version_pattern, f"version = '{new_version}'", setup_contents)

# Write the updated contents back to setup.py
with open(setup_py_path, 'w') as setup_file:
setup_file.write(updated_setup_contents)

print(f"Version bumped up from {current_version} to {new_version}")
return new_version


new_version_from_setup = update_version()
def update_change_log():
change_log_path = os.path.join(root_dir, 'CHANGELOG.md')
change_log_blob = [
f'## [{new_version_from_setup}] - {datetime.now().strftime("%Y-%m-%d")}',
change_log_line,
f'- [#${pr_number}](https://github.com/unity-sds/unity-data-services/pull/{pr_number}) {pr_title}'
]
with open(change_log_path, 'r') as change_log_file:
change_logs = change_log_file.read().splitlines()
pattern = r"## \[\d+\.\d+\.\d+\] - \d{4}-\d{2}-\d{2}"

inserting_line = 0
for i, each_line in enumerate(change_logs):
if re.search(pattern, each_line):
inserting_line = i
break
inserting_line = inserting_line - 1 if inserting_line > 0 else inserting_line
for i, each_line in enumerate(change_log_blob):
change_logs.insert(inserting_line, each_line)
inserting_line += 1
change_logs = '\n'.join(change_logs)

with open(change_log_path, 'w') as change_log_file:
change_log_file.write(change_logs)
return
update_change_log()