diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f8a7849e7ea..e7bf24967b6 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -2,7 +2,7 @@ name: "CodeQL" on: push: - branches: [develop, v2] + branches: [v1] jobs: analyze: diff --git a/.github/workflows/on_push_docs.yml b/.github/workflows/on_push_docs.yml deleted file mode 100644 index d46879ca6b1..00000000000 --- a/.github/workflows/on_push_docs.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Docs - -on: - push: - branches: - - develop - paths: - - "docs/**" - - "mkdocs.yml" - - "examples/**" - -jobs: - changelog: - permissions: - contents: write - uses: ./.github/workflows/reusable_publish_changelog.yml - - release-docs: - needs: changelog - permissions: - contents: write - pages: write - uses: ./.github/workflows/reusable_publish_docs.yml - with: - version: develop - alias: stage -# Maintenance: Only necessary in repo migration -# - name: Create redirect from old docs -# run: | -# git checkout gh-pages -# test -f 404.html && echo "Redirect already set" && exit 0 -# git checkout develop -- 404.html -# git add 404.html -# git commit -m "chore: set docs redirect" --no-verify -# git push origin gh-pages -f diff --git a/.github/workflows/on_release_notes.yml b/.github/workflows/on_release_notes.yml index 2b431defff0..17873a1b739 100644 --- a/.github/workflows/on_release_notes.yml +++ b/.github/workflows/on_release_notes.yml @@ -21,10 +21,11 @@ name: Publish to PyPi # See MAINTAINERS.md "Releasing a new version" for release mechanisms env: - BRANCH: develop + BRANCH: v1 on: release: + # We can't filter by tag here, so we filter later on the first job types: [published] workflow_dispatch: inputs: @@ -45,6 +46,7 @@ on: jobs: release: + if: ${{ startsWith(github.ref, 'refs/tags/v1') }} environment: release runs-on: ubuntu-latest permissions: @@ -121,22 +123,8 @@ jobs: alias: latest detached_mode: true - post_release: + publish_layer: needs: release - permissions: - contents: read - issues: write - discussions: write - pull-requests: write - runs-on: ubuntu-latest - env: - RELEASE_VERSION: ${{ needs.release.outputs.RELEASE_VERSION }} - steps: - - uses: actions/checkout@v3 - - name: Close issues related to this release - uses: actions/github-script@v6 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - script: | - const post_release = require('.github/scripts/post_release.js') - await post_release({github, context, core}) + uses: ./.github/workflows/publish_layer.yml + with: + latest_published_version: ${{ needs.release.outputs.RELEASE_VERSION }} diff --git a/.github/workflows/publish_layer.yml b/.github/workflows/publish_layer.yml index 564cbfad9de..0fe5f105020 100644 --- a/.github/workflows/publish_layer.yml +++ b/.github/workflows/publish_layer.yml @@ -11,15 +11,16 @@ on: description: "Latest PyPi published version to rebuild latest docs for, e.g. v1.22.0" default: "v1.22.0" required: true - workflow_run: - workflows: ["Publish to PyPi"] - types: - - completed + workflow_call: + inputs: + latest_published_version: + type: string + description: "Latest PyPi published version to rebuild latest docs for, e.g. v1.22.0" + required: true jobs: build-layer: runs-on: ubuntu-latest - if: ${{ (github.event.workflow_run.conclusion == 'success') || (github.event_name == 'workflow_dispatch') }} defaults: run: working-directory: ./layer @@ -50,13 +51,13 @@ jobs: RELEASE_INPUT=${{ inputs.latest_published_version }} LATEST_TAG=$(git describe --tag --abbrev=0) RELEASE_TAG_VERSION=${RELEASE_INPUT:-$LATEST_TAG} - echo "RELEASE_TAG_VERSION=${RELEASE_TAG_VERSION:1}" >> $GITHUB_ENV + echo "RELEASE_TAG_VERSION=${RELEASE_TAG_VERSION:1}" >> "$GITHUB_ENV" - name: install cdk and deps run: | npm install -g aws-cdk@2.29.0 cdk --version - name: CDK build - run: cdk synth --context version=$RELEASE_TAG_VERSION -o cdk.out + run: cdk synth --context version="$RELEASE_TAG_VERSION" -o cdk.out - name: zip output run: zip -r cdk.out.zip cdk.out - name: Archive CDK artifacts @@ -66,8 +67,7 @@ jobs: path: layer/cdk.out.zip deploy-beta: - needs: - - build-layer + needs: build-layer uses: ./.github/workflows/reusable_deploy_layer_stack.yml secrets: inherit with: @@ -76,8 +76,7 @@ jobs: environment: "layer-beta" deploy-prod: - needs: - - deploy-beta + needs: deploy-beta uses: ./.github/workflows/reusable_deploy_layer_stack.yml secrets: inherit with: diff --git a/.github/workflows/publish_v2_layer.yml b/.github/workflows/publish_v2_layer.yml deleted file mode 100644 index 850063098cd..00000000000 --- a/.github/workflows/publish_v2_layer.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Deploy v2 layer to all regions - -permissions: - id-token: write - contents: read - -on: - workflow_dispatch: - inputs: - latest_published_version: - description: "Latest PyPi published version to rebuild latest docs for, e.g. v1.22.0" - required: true - -jobs: - dummy: - runs-on: ubuntu-latest - steps: - - name: Hello world - run: echo "hello world" diff --git a/.github/workflows/python_build.yml b/.github/workflows/python_build.yml index 812ae7b41dd..86aae37cfa7 100644 --- a/.github/workflows/python_build.yml +++ b/.github/workflows/python_build.yml @@ -9,8 +9,7 @@ on: - "poetry.lock" - "mypy.ini" branches: - - develop - - v2 + - v1 push: paths: - "aws_lambda_powertools/**" @@ -19,8 +18,7 @@ on: - "poetry.lock" - "mypy.ini" branches: - - develop - - v2 + - v1 jobs: build: diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml deleted file mode 100644 index 68f3cfb962a..00000000000 --- a/.github/workflows/release-drafter.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Release Drafter - -on: - push: - branches: - - develop - workflow_dispatch: - -jobs: - update_release_draft: - runs-on: ubuntu-latest - steps: - - uses: release-drafter/release-drafter@6df64e4ba4842c203c604c1f45246c5863410adb # v5.20.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.github/workflows/reusable_deploy_v2_sar.yml b/.github/workflows/reusable_deploy_v2_sar.yml deleted file mode 100644 index 905fd20d5d1..00000000000 --- a/.github/workflows/reusable_deploy_v2_sar.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Deploy V2 SAR - -on: - workflow_call: - inputs: - stage: - description: "Deployment stage (BETA, PROD)" - required: true - type: string - artefact-name: - description: "CDK Layer Artefact name to download" - required: true - type: string - package-version: - description: "The version of the package to deploy" - required: true - type: string - environment: - description: "GitHub Environment to use for encrypted secrets" - required: true - type: string - -jobs: - dummy: - runs-on: ubuntu-latest - steps: - - name: Hello world - run: echo "hello world" diff --git a/.github/workflows/reusable_publish_changelog.yml b/.github/workflows/reusable_publish_changelog.yml index 30e49b98ae5..f220bcfc1d5 100644 --- a/.github/workflows/reusable_publish_changelog.yml +++ b/.github/workflows/reusable_publish_changelog.yml @@ -7,7 +7,7 @@ permissions: contents: write env: - BRANCH: develop + BRANCH: v1 jobs: publish_changelog: diff --git a/.github/workflows/reusable_publish_docs.yml b/.github/workflows/reusable_publish_docs.yml index a157783abf4..e637aa4f4e0 100644 --- a/.github/workflows/reusable_publish_docs.yml +++ b/.github/workflows/reusable_publish_docs.yml @@ -1,7 +1,7 @@ name: Reusable publish documentation env: - BRANCH: develop + BRANCH: v1 ORIGIN: awslabs/aws-lambda-powertools-python on: diff --git a/.github/workflows/run-e2e-tests.yml b/.github/workflows/run-e2e-tests.yml index 86176968839..e4a90cac0d6 100644 --- a/.github/workflows/run-e2e-tests.yml +++ b/.github/workflows/run-e2e-tests.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: push: - branches: [develop, v2] + branches: [v1] paths: - "aws_lambda_powertools/**" - "tests/e2e/**" diff --git a/.github/workflows/v2_on_push_docs.yml b/.github/workflows/v2_on_push_docs.yml deleted file mode 100644 index d70fedbc6c5..00000000000 --- a/.github/workflows/v2_on_push_docs.yml +++ /dev/null @@ -1,36 +0,0 @@ -name: Docs v2 - -on: - workflow_dispatch: -# push: -# branches: -# - v2 -# paths: -# - "docs/**" -# - "mkdocs.yml" -# - "examples/**" - -jobs: - changelog: - permissions: - contents: write - uses: ./.github/workflows/reusable_publish_changelog.yml - - release-docs: - needs: changelog - permissions: - contents: write - pages: write - uses: ./.github/workflows/reusable_publish_docs.yml - with: - version: v2 - alias: alpha -# Maintenance: Only necessary in repo migration -# - name: Create redirect from old docs -# run: | -# git checkout gh-pages -# test -f 404.html && echo "Redirect already set" && exit 0 -# git checkout develop -- 404.html -# git add 404.html -# git commit -m "chore: set docs redirect" --no-verify -# git push origin gh-pages -f diff --git a/.github/workflows/v2_rebuild_latest_docs.yml b/.github/workflows/v2_rebuild_latest_docs.yml deleted file mode 100644 index 6d833cc3fef..00000000000 --- a/.github/workflows/v2_rebuild_latest_docs.yml +++ /dev/null @@ -1,14 +0,0 @@ -name: V2 Rebuild latest docs - -on: - workflow_dispatch: - -jobs: - release-docs: - permissions: - contents: write - pages: write - uses: ./.github/workflows/reusable_publish_docs.yml - with: - version: v2 - alias: alpha diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 71b1125cf54..0ffeed560f4 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -40,7 +40,7 @@ repos: - id: cfn-python-lint files: examples/.*\.(yaml|yml)$ - repo: https://github.com/rhysd/actionlint - rev: v1.6.16 + rev: v1.6.21 hooks: - id: actionlint-docker args: [-pyflakes=] pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy