From 90fc32068eac291c9667d7a985234e38d7b004c0 Mon Sep 17 00:00:00 2001 From: IA Automator Date: Sun, 29 Sep 2024 15:35:10 +0000 Subject: [PATCH 1/2] (automated) Updates from project type --- .copier-answers.yml | 4 ++-- .project_automation/publication/entrypoint.sh | 15 +++++++++++++++ .project_config.yml | 2 ++ 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.copier-answers.yml b/.copier-answers.yml index 3f57ece..d6f7edb 100644 --- a/.copier-answers.yml +++ b/.copier-answers.yml @@ -1,6 +1,6 @@ # This file is auto-generated, changes will be overwritten -_commit: v0.1.4 -_src_path: /task/f0ec3dcc-afe2-11ee-8091-0668063857e2/projecttype +_commit: v1.0.0 +_src_path: /task/59917f39-7e78-11ef-956d-6ad65699f73e/projecttype starting_version: v0.0.0 version_file: VERSION diff --git a/.project_automation/publication/entrypoint.sh b/.project_automation/publication/entrypoint.sh index 67e5c65..b11e854 100755 --- a/.project_automation/publication/entrypoint.sh +++ b/.project_automation/publication/entrypoint.sh @@ -5,6 +5,9 @@ PROJECT_PATH=${BASE_PATH}/project PROJECT_TYPE_PATH=${BASE_PATH}/projecttype +echo "[STAGE: Publication]" +VERSION=$(cat VERSION) +echo $VERSION BRANCH=main EXISTING_GIT_VERSION="$(git tag -l)" HUGO_VERSION=$(hugo version) @@ -15,6 +18,18 @@ VERSION=$(cat VERSION) BASE_URL="this would be the path to s3 bucket/${REPO_NAME}/" S3_URI="s3://aws-abi/guide/${REPO_NAME}/" +<<<<<<< before updating +======= + + +if [[ $(echo $EXISTING_GIT_VERSION | grep $VERSION) ]] +then + echo "version exists skipping release creation hint: Bump version in VERSION file" +else + echo "creating new version" + gh release create ${VERSION} --target ${BRANCH} --generate-notes +fi +>>>>>>> after updating print_header() { printf "\n\n%s\n" "$*" diff --git a/.project_config.yml b/.project_config.yml index 742776f..b049876 100644 --- a/.project_config.yml +++ b/.project_config.yml @@ -12,6 +12,8 @@ functional_tests: dockerfile: .project_automation/functional_tests/Dockerfile entrypoint: .project_automation/functional_tests/entrypoint.sh publication: + github_permissions: + contents: write enable_docker: true dockerfile: .project_automation/publication/Dockerfile entrypoint: .project_automation/publication/entrypoint.sh From 90fdda3971ae9d8cd8810cdea0ef87749df22e3b Mon Sep 17 00:00:00 2001 From: Andrew Glenn <29951057+andrew-glenn@users.noreply.github.com> Date: Mon, 30 Sep 2024 14:16:27 -0500 Subject: [PATCH 2/2] fixing merge conflict. --- .project_automation/publication/entrypoint.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.project_automation/publication/entrypoint.sh b/.project_automation/publication/entrypoint.sh index b11e854..f18eb67 100755 --- a/.project_automation/publication/entrypoint.sh +++ b/.project_automation/publication/entrypoint.sh @@ -18,9 +18,6 @@ VERSION=$(cat VERSION) BASE_URL="this would be the path to s3 bucket/${REPO_NAME}/" S3_URI="s3://aws-abi/guide/${REPO_NAME}/" -<<<<<<< before updating -======= - if [[ $(echo $EXISTING_GIT_VERSION | grep $VERSION) ]] then @@ -29,7 +26,6 @@ else echo "creating new version" gh release create ${VERSION} --target ${BRANCH} --generate-notes fi ->>>>>>> after updating print_header() { printf "\n\n%s\n" "$*"