diff --git a/.github/workflows/UploadDockerImage.yml b/.github/workflows/UploadDockerImage.yml index ac4f6332..51845e01 100644 --- a/.github/workflows/UploadDockerImage.yml +++ b/.github/workflows/UploadDockerImage.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: push: branches: - - main + - v3sdk-release permissions: id-token: write diff --git a/.github/workflows/aws-ci.yml b/.github/workflows/aws-ci.yml index 65893451..aa5db19d 100644 --- a/.github/workflows/aws-ci.yml +++ b/.github/workflows/aws-ci.yml @@ -5,8 +5,8 @@ on: workflow_dispatch: pull_request: branches: - - main - - dev + - v3sdk-release + - v3sdk-development - 'feature/**' permissions: diff --git a/.github/workflows/create-release-pr.yml b/.github/workflows/create-release-pr.yml index 8528d457..e725e56b 100644 --- a/.github/workflows/create-release-pr.yml +++ b/.github/workflows/create-release-pr.yml @@ -2,7 +2,7 @@ # The workflow will also create a PR that targets `dev` from the release branch. name: Create Release PR -# This workflow is manually triggered when in preparation for a release. The workflow should be dispatched from the `dev` branch. +# This workflow is manually triggered when in preparation for a release. The workflow should be dispatched from the `v3sdk-development` branch. on: workflow_dispatch: inputs: @@ -96,6 +96,6 @@ jobs: env: GITHUB_TOKEN: ${{ env.AWS_SECRET_TOKEN }} run: | - pr_url="$(gh pr create --title "${{ steps.read-release-name.outputs.VERSION }}" --body "${{ steps.read-changelog.outputs.CHANGELOG }}" --base dev --head ${{ steps.create-release-branch.outputs.BRANCH }})" + pr_url="$(gh pr create --title "${{ steps.read-release-name.outputs.VERSION }}" --body "${{ steps.read-changelog.outputs.CHANGELOG }}" --base v3sdk-development --head ${{ steps.create-release-branch.outputs.BRANCH }})" gh label create "Release PR" --description "A Release PR that includes versioning and changelog changes" -c "#FF0000" -f gh pr edit $pr_url --add-label "Release PR" diff --git a/.github/workflows/semgrep-analysis.yml b/.github/workflows/semgrep-analysis.yml index 3abbc246..d0ad561b 100644 --- a/.github/workflows/semgrep-analysis.yml +++ b/.github/workflows/semgrep-analysis.yml @@ -5,7 +5,7 @@ on: pull_request: push: - branches: ["dev", "main"] + branches: ["v3sdk-development", "v3sdk-release"] schedule: - cron: '23 20 * * 1' @@ -30,7 +30,7 @@ jobs: p/owasp-top-ten - name: Upload SARIF file for GitHub Advanced Security Dashboard - uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f #v3.28.18 + uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e #v3.28.19 with: sarif_file: semgrep.sarif if: always() diff --git a/.github/workflows/sync-main-dev.yml b/.github/workflows/sync-main-dev.yml index 2de87805..b10d3e8f 100644 --- a/.github/workflows/sync-main-dev.yml +++ b/.github/workflows/sync-main-dev.yml @@ -1,7 +1,7 @@ # This GitHub Workflow is designed to run automatically after the Release PR, which was created by the `Create Release PR` workflow, is closed. # This workflow has 2 jobs. One will run if the `Release PR` is successfully merged, indicating that a release should go out. # The other will run if the `Release PR` was closed and a release is not intended to go out. -name: Sync 'dev' and 'main' +name: Sync 'v3sdk-development' and 'v3sdk-release' # The workflow will automatically be triggered when any PR is closed. on: @@ -13,15 +13,15 @@ permissions: id-token: write jobs: - # This job will check if the PR was successfully merged, it's source branch is `releases/next-release` and target branch is `dev`. + # This job will check if the PR was successfully merged, it's source branch is `releases/next-release` and target branch is `v3sdk-development`. # This indicates that the merged PR was the `Release PR`. - # This job will synchronize `dev` and `main`, create a GitHub Release and delete the `releases/next-release` branch. + # This job will synchronize `v3sdk-development` and `v3sdk-release`, create a GitHub Release and delete the `releases/next-release` branch. sync-dev-and-main: - name: Sync dev and main + name: Sync v3sdk-development and v3sdk-release if: | github.event.pull_request.merged == true && github.event.pull_request.head.ref == 'releases/next-release' && - github.event.pull_request.base.ref == 'dev' + github.event.pull_request.base.ref == 'v3sdk-development' runs-on: ubuntu-latest steps: # Assume an AWS Role that provides access to the Access Token @@ -41,7 +41,7 @@ jobs: - name: Checkout code uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 #v4.2.2 with: - ref: dev + ref: v3sdk-development fetch-depth: 0 token: ${{ env.AWS_SECRET_TOKEN }} # Install .NET8 which is needed for AutoVer @@ -75,13 +75,13 @@ jobs: run: | changelog=$(autover changelog --output-to-console) echo "CHANGELOG<> "$GITHUB_OUTPUT" - # Merge dev into main in order to synchronize the 2 branches - - name: Merge dev to main + # Merge v3sdk-development into v3sdk-release in order to synchronize the 2 branches + - name: Merge v3sdk-development to v3sdk-release run: | git fetch origin - git checkout main - git merge dev - git push origin main + git checkout v3sdk-release + git merge v3sdk-development + git push origin v3sdk-release # Create the GitHub Release - name: Create GitHub Release env: @@ -93,7 +93,7 @@ jobs: run: | git fetch origin git push origin --delete releases/next-release - # This job will check if the PR was closed, it's source branch is `releases/next-release` and target branch is `dev`. + # This job will check if the PR was closed, it's source branch is `releases/next-release` and target branch is `v3sdk-development`. # This indicates that the closed PR was the `Release PR`. # This job will delete the tag created by AutoVer and the release branch. clean-up-closed-release: @@ -101,7 +101,7 @@ jobs: if: | github.event.pull_request.merged == false && github.event.pull_request.head.ref == 'releases/next-release' && - github.event.pull_request.base.ref == 'dev' + github.event.pull_request.base.ref == 'v3sdk-development' runs-on: ubuntu-latest steps: # Checkout a full clone of the repo diff --git a/test/AWS.Deploy.CLI.IntegrationTests/WebAppNoDockerFileTests.cs b/test/AWS.Deploy.CLI.IntegrationTests/WebAppNoDockerFileTests.cs index 603add1c..88334db5 100644 --- a/test/AWS.Deploy.CLI.IntegrationTests/WebAppNoDockerFileTests.cs +++ b/test/AWS.Deploy.CLI.IntegrationTests/WebAppNoDockerFileTests.cs @@ -172,7 +172,7 @@ public async Task BeanstalkArmDeployment() await _interactiveService.StdInWriter.WriteAsync(Environment.NewLine); // Confirm selection and deploy await _interactiveService.StdInWriter.WriteLineAsync("more"); // Select "Environment Architecture" await _interactiveService.StdInWriter.WriteLineAsync("1"); // Select "EC2 Instance Type" - await _interactiveService.StdInWriter.WriteLineAsync("n"); // Don't select free tier which forces t3.micro to be used instead of t2.micro + await _interactiveService.StdInWriter.WriteLineAsync("y"); // t3.micro is in free tier so use that await _interactiveService.StdInWriter.WriteLineAsync("1"); // Select "x86_64" await _interactiveService.StdInWriter.WriteLineAsync("1"); // Select "CPU Cores" await _interactiveService.StdInWriter.WriteLineAsync("1"); // Select "Instance Memory"