diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index 136f7d36642..d8cc5c1450f 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -42,16 +42,14 @@ jobs: fi echo "Release v${AGENT_VERSION} does not exist. Proceeding." - - name: Fetch dev branch + - name: Fetch latest remote refs run: | - git fetch origin dev:dev + git fetch origin - name: Create staging branch run: | BRANCH_NAME="v${AGENT_VERSION}-stage" - git checkout -b "$BRANCH_NAME" origin/dev - COMMIT_SHA=$(git rev-parse HEAD) - echo "Staging branch: $BRANCH_NAME at $COMMIT_SHA" + git checkout -b "$BRANCH_NAME" echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV - name: Generate changelog @@ -139,6 +137,13 @@ jobs: git config user.email "amazon-ecs-bot@amazon.com" git commit -m "Release ${AGENT_VERSION}" + - name: Generate App Token + id: app-token + uses: actions/create-github-app-token@v3 + with: + app-id: ${{ secrets.APP_ID }} + private-key: ${{ secrets.APP_PRIVATE_KEY }} + - name: Push staging branch to origin run: | echo "Pushing branch ${BRANCH_NAME} to origin..." @@ -146,7 +151,7 @@ jobs: - name: Create pull request env: - GH_TOKEN: ${{ secrets.ECS_AGENT_WORKFLOW_SECRET }} + GH_TOKEN: ${{ steps.app-token.outputs.token }} run: | PR_BODY=$(cat < - 1.999.99-1 +- Cache Agent version 1.999.99 + * Mon Mar 30 2026 Amogh Rathore - 1.102.2-1 - Cache Agent version 1.102.2 diff --git a/packaging/generic-deb-integrated/debian/changelog b/packaging/generic-deb-integrated/debian/changelog index 83691971c4b..4e5381f5ead 100644 --- a/packaging/generic-deb-integrated/debian/changelog +++ b/packaging/generic-deb-integrated/debian/changelog @@ -1,3 +1,9 @@ +amazon-ecs-init (1.999.99-1) stable; urgency=medium + + * Cache Agent version 1.999.99 + + -- amazon-ecs-bot Tue, 14 Apr 2026 18:00:00 +0000 + amazon-ecs-init (1.102.2-1) stable; urgency=medium * Cache Agent version 1.102.2 diff --git a/packaging/generic-rpm-integrated/amazon-ecs-init.spec b/packaging/generic-rpm-integrated/amazon-ecs-init.spec index cb02881f6f7..160f1a20eda 100644 --- a/packaging/generic-rpm-integrated/amazon-ecs-init.spec +++ b/packaging/generic-rpm-integrated/amazon-ecs-init.spec @@ -19,7 +19,7 @@ %global agent_image ecs-agent-v%{version}.tar Name: amazon-ecs-init -Version: 1.102.2 +Version: 1.999.99 Release: 1 License: Apache 2.0 Summary: Amazon Elastic Container Service initialization application @@ -93,6 +93,9 @@ ln -sf %{basename:%{agent_image}} %{_cachedir}/ecs/ecs-agent.tar %systemd_postun_with_restart amazon-ecs-volume-plugin %changelog +* Tue Apr 14 2026 amazon-ecs-bot - 1.999.99-1 +- Cache Agent version 1.999.99 + * Mon Mar 30 2026 Amogh Rathore - 1.102.2-1 - Cache Agent version 1.102.2 diff --git a/packaging/suse/amazon-ecs-init.changes b/packaging/suse/amazon-ecs-init.changes index d5e45bf7c50..98e6d446577 100644 --- a/packaging/suse/amazon-ecs-init.changes +++ b/packaging/suse/amazon-ecs-init.changes @@ -1,4 +1,8 @@ ------------------------------------------------------------------- +Tue Apr 14, 18:00:00 UTC 2026 - amazon-ecs-bot@amazon.com - 1.999.99-1 + +- Cache Agent version 1.999.99 +------------------------------------------------------------------- Mon Mar 30, 17:00:00 UTC 2026 - amoghr@amazon.com - 1.102.2-1 - Cache Agent version 1.102.2 diff --git a/scripts/changelog/CHANGELOG_MASTER b/scripts/changelog/CHANGELOG_MASTER index 93d4e1a47a7..725e5627777 100644 --- a/scripts/changelog/CHANGELOG_MASTER +++ b/scripts/changelog/CHANGELOG_MASTER @@ -1,3 +1,8 @@ +1.999.99-1 +amazon-ecs-bot +2026-04-14T10:00:00-08:00 +Cache Agent version 1.999.99 + 1.102.2-1 Amogh Rathore 2026-03-30T10:00:00-07:00 diff --git a/scripts/generate-release-changelog.sh b/scripts/generate-release-changelog.sh index 2a20075d012..7ac4433c8a5 100755 --- a/scripts/generate-release-changelog.sh +++ b/scripts/generate-release-changelog.sh @@ -20,8 +20,8 @@ set -e OUTPUT_FILE="CHANGELOG.md" REPO_OWNER="aws" REPO_NAME="amazon-ecs-agent" -BASE_BRANCH="master" -DEV_BRANCH="dev" +BASE_BRANCH="origin/master" +DEV_BRANCH="origin/dev" AGENT_VERSION="" # Global arrays to store changelog entries by category @@ -136,7 +136,7 @@ get_release_changes() { local commits # Exclude merge commits using --no-merges - commits=$(git log ${BASE_BRANCH}..${DEV_BRANCH} --no-merges --format=%H 2>/dev/null) + commits=$(git log ${BASE_BRANCH}..${DEV_BRANCH} --no-merges --format=%H) if [ $? -ne 0 ]; then log_error "Failed to get commits. Make sure you're in a git repository and both ${BASE_BRANCH} and ${DEV_BRANCH} branches exist"