From 20c4839cf400a6ae9980d5b54a19d6818bfd5e78 Mon Sep 17 00:00:00 2001 From: Luca Palmieri <20745048+LukeMathWalker@users.noreply.github.com> Date: Thu, 2 Feb 2023 12:43:26 +0000 Subject: [PATCH] We need to checkout in the `smithy-rs` folder because that's an assumption baked into the definition of the docker-build action. (#2284) --- .github/workflows/release.yml | 8 +++++--- tools/ci-scripts/generate-new-changelog-next-toml | 2 +- tools/ci-scripts/upgrade-gradle-properties | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b45c391bef..0d0074278f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -117,11 +117,12 @@ jobs: - uses: actions/checkout@v3 with: ref: ${{ inputs.release_branch }} + path: smithy-rs token: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }} - name: Upgrade gradle.properties - uses: ./.github/actions/docker-build + uses: ./smithy-rs/.github/actions/docker-build with: - action: upgrade-gradle-smithy-rs-release ${{ inputs.semantic_version }} + action: upgrade-gradle-properties ${{ inputs.semantic_version }} - name: Push gradle.properties changes id: gradle-push shell: bash @@ -217,9 +218,10 @@ jobs: uses: actions/checkout@v3 with: ref: ${{ inputs.commit_sha }} + path: smithy-rs token: ${{ secrets.RELEASE_AUTOMATION_BOT_PAT }} - name: Empty CHANGELOG.next.toml - uses: ./.github/actions/docker-build + uses: ./smithy-rs/.github/actions/docker-build with: action: generate-new-changelog-next-toml - name: Push smithy-rs changes diff --git a/tools/ci-scripts/generate-new-changelog-next-toml b/tools/ci-scripts/generate-new-changelog-next-toml index e318c01e7f..0411a2f312 100755 --- a/tools/ci-scripts/generate-new-changelog-next-toml +++ b/tools/ci-scripts/generate-new-changelog-next-toml @@ -6,4 +6,4 @@ set -eux -changelogger init > CHANGELOG.next.toml +changelogger init > smithy-rs/CHANGELOG.next.toml diff --git a/tools/ci-scripts/upgrade-gradle-properties b/tools/ci-scripts/upgrade-gradle-properties index 3402ae23e3..5ba010b244 100755 --- a/tools/ci-scripts/upgrade-gradle-properties +++ b/tools/ci-scripts/upgrade-gradle-properties @@ -6,4 +6,4 @@ set -eux -publisher upgrade-runtime-crates-version --version ${1} +publisher upgrade-runtime-crates-version --version ${1} --gradle-properties-path smithy-rs/gradle.properties