Skip to content

Rename master to main, localstack-ext to localstack-pro #12847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 16, 2025
Merged

Rename master to main, localstack-ext to localstack-pro #12847

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
eb2ae6e
Change default branch name from master to main
dfangl Jul 8, 2025
3e234fc
Change localstack-ext -> localstack-pro
dfangl Jul 8, 2025
3af129c
update remaining usages of master with main
alexrashed Jul 15, 2025
99be1dc
fix rebase hiccup
alexrashed Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!-- Please refer to the contribution guidelines before raising a PR: https://github.com/localstack/localstack/blob/master/docs/CONTRIBUTING.md -->
<!-- Please refer to the contribution guidelines before raising a PR: https://github.com/localstack/localstack/blob/main/docs/CONTRIBUTING.md -->

<!-- Why am I raising this PR? Add context such as related issues, PRs, or documentation. -->
## Motivation
Expand Down
2 changes: 1 addition & 1 deletion .github/bot_templates/ASF_UPGRADE_PR.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 🚀 ASF Update Report 🚀
This PR has been automatically generated to update the generated API stubs for our ASF services.
It uses the latest code-generator from the _master_ branch ([scaffold.py](https://github.com/localstack/localstack/blob/master/localstack/aws/scaffold.py)) and the latest _published_ version of [botocore](https://github.com/boto/botocore) to re-generate all API stubs which are already present in the `localstack.aws.api` module of the _master_ branch.
It uses the latest code-generator from the _main_ branch ([scaffold.py](https://github.com/localstack/localstack/blob/main/localstack/aws/scaffold.py)) and the latest _published_ version of [botocore](https://github.com/boto/botocore) to re-generate all API stubs which are already present in the `localstack.aws.api` module of the _main_ branch.

## 🔄 Updated Services
This PR updates the following services:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/asf-updates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ jobs:
id: check-for-changes
run: |
# Check if there are changed files and store the result in target/diff-check.log
# Check against the PR branch if it exists, otherwise against the master
# Check against the PR branch if it exists, otherwise against the main
# Store the result in target/diff-check.log and store the diff count in the GitHub Action output "diff-count"
mkdir -p target
(git diff --name-only origin/asf-auto-updates localstack-core/localstack/aws/api/ 2>/dev/null || git diff --name-only origin/master localstack-core/localstack/aws/api/ 2>/dev/null) | tee target/diff-check.log
(git diff --name-only origin/asf-auto-updates localstack-core/localstack/aws/api/ 2>/dev/null || git diff --name-only origin/main localstack-core/localstack/aws/api/ 2>/dev/null) | tee target/diff-check.log
echo "diff-count=$(cat target/diff-check.log | wc -l)" >> $GITHUB_OUTPUT

# Store a (multiline-sanitized) list of changed services (compared to the master) in the GitHub Action output "changed-services"
# Store a (multiline-sanitized) list of changed services (compared to the main) in the GitHub Action output "changed-services"
echo "changed-services<<EOF" >> $GITHUB_OUTPUT
echo "$(git diff --name-only origin/master localstack-core/localstack/aws/api/ | sed 's#localstack-core/localstack/aws/api/#- #g' | sed 's#/__init__.py##g' | sed 's/_/-/g')" >> $GITHUB_OUTPUT
echo "$(git diff --name-only origin/main localstack-core/localstack/aws/api/ | sed 's#localstack-core/localstack/aws/api/#- #g' | sed 's#/__init__.py##g' | sed 's/_/-/g')" >> $GITHUB_OUTPUT
echo "EOF" >> $GITHUB_OUTPUT

- name: Update botocore and transitive pins
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/aws-main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
- '!.git-blame-ignore-revs'
- '!docs/**'
branches:
- master
- main
tags:
- 'v[0-9]+.[0-9]+.[0-9]+'
pull_request:
Expand Down Expand Up @@ -189,8 +189,8 @@ jobs:
push:
name: "Push images"
runs-on: ubuntu-latest
# push image on master, target branch not set, and the dependent steps were either successful or skipped
if: ( github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') ) && !failure() && !cancelled() && github.repository == 'localstack/localstack'
# push image on main, target branch not set, and the dependent steps were either successful or skipped
if: ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) && !failure() && !cancelled() && github.repository == 'localstack/localstack'
needs:
# all tests need to be successful for the image to be pushed
- test
Expand Down Expand Up @@ -269,7 +269,7 @@ jobs:

push-to-tinybird:
name: Push Workflow Status to Tinybird
if: always() && ( github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') ) && github.repository == 'localstack/localstack'
if: always() && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) && github.repository == 'localstack/localstack'
runs-on: ubuntu-latest
needs:
- test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/aws-tests-mamr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:

push-to-tinybird:
name: Push Workflow Status to Tinybird
if: always() && ( github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') ) && github.repository == 'localstack/localstack'
if: always() && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) && github.repository == 'localstack/localstack'
runs-on: ubuntu-latest
needs:
- test-ma-mr
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/aws-tests-s3-image.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ on:
- setup.cfg
- Makefile
branches:
- master
- main
pull_request:
paths:
- .github/workflows/tests-s3-image.yml
Expand Down Expand Up @@ -71,8 +71,8 @@ env:
CI_COMMIT_BRANCH: ${{ github.head_ref || github.ref_name }}
CI_COMMIT_SHA: ${{ github.sha }}
CI_JOB_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}
# report to tinybird if executed on master
TINYBIRD_PYTEST_ARGS: "${{ github.repository == 'localstack/localstack' && github.ref == 'refs/heads/master' && '--report-to-tinybird ' || '' }}"
# report to tinybird if executed on main
TINYBIRD_PYTEST_ARGS: "${{ github.repository == 'localstack/localstack' && github.ref == 'refs/heads/main' && '--report-to-tinybird ' || '' }}"


jobs:
Expand Down Expand Up @@ -268,7 +268,7 @@ jobs:
failOnError: false

push-to-tinybird:
if: always() && github.ref == 'refs/heads/master' && github.repository == 'localstack/localstack'
if: always() && github.ref == 'refs/heads/main' && github.repository == 'localstack/localstack'
runs-on: ubuntu-latest
needs: push-s3-image
steps:
Expand Down
36 changes: 18 additions & 18 deletions .github/workflows/aws-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ env:
CI_COMMIT_BRANCH: ${{ github.head_ref || github.ref_name }}
CI_COMMIT_SHA: ${{ github.sha }}
CI_JOB_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}
# report to tinybird if executed on master
TINYBIRD_PYTEST_ARGS: "${{ github.repository == 'localstack/localstack' && ( github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') ) && '--report-to-tinybird ' || '' }}"
# report to tinybird if executed on main
TINYBIRD_PYTEST_ARGS: "${{ github.repository == 'localstack/localstack' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) && '--report-to-tinybird ' || '' }}"
DOCKER_PULL_SECRET_AVAILABLE: ${{ secrets.DOCKERHUB_PULL_USERNAME != '' && secrets.DOCKERHUB_PULL_TOKEN != '' && 'true' || 'false' }}


Expand All @@ -148,9 +148,9 @@ jobs:
- ubuntu-latest
- ubuntu-24.04-arm
exclude:
# skip the ARM integration tests in forks, and also if not on master/upgrade-dependencies and forceARMTests is not set to true
# skip the ARM integration tests in forks, and also if not on main/upgrade-dependencies and forceARMTests is not set to true
# TODO ARM runners are not yet available for private repositories; skip them for potential private forks
- runner: ${{ ((github.repository != 'localstack/localstack') || (github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false)) && 'ubuntu-24.04-arm' || ''}}
- runner: ${{ ((github.repository != 'localstack/localstack') || (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false)) && 'ubuntu-24.04-arm' || ''}}
fail-fast: false
runs-on: ${{ matrix.runner }}
steps:
Expand All @@ -166,7 +166,7 @@ jobs:
fetch-depth: 0

- name: Build Image
uses: localstack/localstack/.github/actions/build-image@master
uses: localstack/localstack/.github/actions/build-image@main
with:
disableCaching: ${{ inputs.disableCaching == true && 'true' || 'false' }}
dockerhubPullUsername: ${{ secrets.DOCKERHUB_PULL_USERNAME }}
Expand Down Expand Up @@ -336,9 +336,9 @@ jobs:
- ubuntu-latest
- ubuntu-24.04-arm
exclude:
# skip the ARM integration tests in forks, and also if not on master/upgrade-dependencies and forceARMTests is not set to true
# skip the ARM integration tests in forks, and also if not on main/upgrade-dependencies and forceARMTests is not set to true
# TODO ARM runners are not yet available for private repositories; skip them for potential private forks
- runner: ${{ ((github.repository != 'localstack/localstack') || (github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false)) && 'ubuntu-24.04-arm' || ''}}
- runner: ${{ ((github.repository != 'localstack/localstack') || (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false)) && 'ubuntu-24.04-arm' || ''}}
fail-fast: false
runs-on: ${{ matrix.runner }}
env:
Expand Down Expand Up @@ -495,9 +495,9 @@ jobs:
- amd64
- arm64
exclude:
# skip the ARM integration tests in forks, and also if not on master/upgrade-dependencies and forceARMTests is not set to true
# skip the ARM integration tests in forks, and also if not on main/upgrade-dependencies and forceARMTests is not set to true
# TODO ARM runners are not yet available for private repositories; skip them for potential private forks
- arch: ${{ ((github.repository != 'localstack/localstack') || (github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false)) && 'arm64' || ''}}
- arch: ${{ ((github.repository != 'localstack/localstack') || (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false)) && 'arm64' || ''}}
needs:
- test-integration
- test-bootstrap
Expand Down Expand Up @@ -541,9 +541,9 @@ jobs:
- ubuntu-latest
- ubuntu-24.04-arm
exclude:
# skip the ARM integration tests in forks, and also if not on master/upgrade-dependencies and forceARMTests is not set to true
# skip the ARM integration tests in forks, and also if not on main/upgrade-dependencies and forceARMTests is not set to true
# TODO ARM runners are not yet available for private repositories; skip them for potential private forks
- runner: ${{ ((github.repository != 'localstack/localstack') || (github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false)) && 'ubuntu-24.04-arm' || ''}}
- runner: ${{ ((github.repository != 'localstack/localstack') || (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false)) && 'ubuntu-24.04-arm' || ''}}
fail-fast: false
runs-on: ${{ matrix.runner }}
env:
Expand Down Expand Up @@ -616,9 +616,9 @@ jobs:
- amd64
- arm64
exclude:
# skip the ARM integration tests in forks, and also if not on master/upgrade-dependencies and forceARMTests is not set to true
# skip the ARM integration tests in forks, and also if not on main/upgrade-dependencies and forceARMTests is not set to true
# TODO ARM runners are not yet available for private repositories; skip them for potential private forks
- arch: ${{ ((github.repository != 'localstack/localstack') || (github.ref != 'refs/heads/master' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false)) && 'arm64' || ''}}
- arch: ${{ ((github.repository != 'localstack/localstack') || (github.ref != 'refs/heads/main' && !startsWith(github.ref, 'refs/tags/v') && github.ref != 'upgrade-dependencies' && inputs.forceARMTests == false)) && 'arm64' || ''}}
needs:
- test-acceptance
runs-on: ubuntu-latest
Expand Down Expand Up @@ -647,7 +647,7 @@ jobs:

test-cloudwatch-v1:
name: Test CloudWatch V1
if: ${{ !inputs.onlyAcceptanceTests && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') || needs.test-preflight.outputs.cloudwatch-v1 == 'true') }}
if: ${{ !inputs.onlyAcceptanceTests && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || needs.test-preflight.outputs.cloudwatch-v1 == 'true') }}
runs-on: ubuntu-latest
needs:
- test-preflight
Expand Down Expand Up @@ -697,7 +697,7 @@ jobs:

test-ddb-v2:
name: Test DynamoDB(Streams) v2
if: ${{ !inputs.onlyAcceptanceTests && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') || needs.test-preflight.outputs.dynamodb-v2 == 'true') }}
if: ${{ !inputs.onlyAcceptanceTests && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || needs.test-preflight.outputs.dynamodb-v2 == 'true') }}
runs-on: ubuntu-latest
needs:
- test-preflight
Expand Down Expand Up @@ -746,7 +746,7 @@ jobs:

test-events-v1:
name: Test EventBridge v1
if: ${{ !inputs.onlyAcceptanceTests && (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') || needs.test-preflight.outputs.events-v1 == 'true') }}
if: ${{ !inputs.onlyAcceptanceTests && (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || needs.test-preflight.outputs.events-v1 == 'true') }}
runs-on: ubuntu-latest
needs:
- test-preflight
Expand Down Expand Up @@ -795,7 +795,7 @@ jobs:

test-cfn-v2-engine:
name: Test CloudFormation Engine v2
if: ${{ !inputs.onlyAcceptanceTests && ( github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') || needs.test-preflight.outputs.cloudformation-v2 == 'true' )}}
if: ${{ !inputs.onlyAcceptanceTests && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') || needs.test-preflight.outputs.cloudformation-v2 == 'true' )}}
runs-on: ubuntu-latest
needs:
- test-preflight
Expand Down Expand Up @@ -890,7 +890,7 @@ jobs:

capture-not-implemented:
name: "Capture Not Implemented"
if: ${{ !inputs.onlyAcceptanceTests && ( github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags/v') ) }}
if: ${{ !inputs.onlyAcceptanceTests && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v') ) }}
runs-on: ubuntu-latest
needs: build
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dockerhub-description.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Update Docker Hub Description
on:
push:
branches:
- master
- main
paths:
- DOCKER.md
- .github/workflows/dockerhub-description.yml
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/marker-report.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:
paths:
- "tests/**"
branches:
- master
- main

concurrency:
group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-cla.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
remote-organization-name: "localstack"
remote-repository-name: "localstack"
path-to-signatures: "etc/cla-signatures/signatures.json"
path-to-document: "https://github.com/localstack/localstack/blob/master/.github/CLA.md"
path-to-document: "https://github.com/localstack/localstack/blob/main/.github/CLA.md"
branch: "cla-signatures"
allowlist: "localstack-bot,*[bot]"
lock-pullrequest-aftermerge: false
6 changes: 3 additions & 3 deletions .github/workflows/pr-enforce-no-major-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Enforce no major on master
name: Enforce no major on main

on:
pull_request_target:
types: [labeled, unlabeled, opened, edited, synchronize]
# only enforce for PRs targeting the master branch
# only enforce for PRs targeting the main branch
branches:
- master
- main

jobs:
enforce-no-major:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/pr-enforce-no-major-minor-master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: Enforce no major or minor on master
name: Enforce no major or minor on main

on:
pull_request_target:
types: [labeled, unlabeled, opened, edited, synchronize]
# only enforce for PRs targeting the master branch
# only enforce for PRs targeting the main branch
branches:
- master
- main

jobs:
enforce-no-major-minor:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-validate-features-files.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
paths:
- localstack-core/localstack/services/**
branches:
- master
- main

jobs:
validate-features-files:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/rebase-release-prs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ jobs:
with:
token: ${{ secrets.PRO_ACCESS_TOKEN }}
head: ${{ matrix.head }}
base: master
base: main
2 changes: 1 addition & 1 deletion .github/workflows/tests-bin.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
- '.github/workflows/tests-bin.yml'
- 'tests/bin/*.bats'
branches:
- master
- main
- release/*

jobs:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests-cli.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ on:
- '!LICENSE.txt'
- '!README.md'
branches:
- master
- main
- release/*

concurrency:
Expand All @@ -64,8 +64,8 @@ env:
CI_COMMIT_BRANCH: ${{ github.head_ref || github.ref_name }}
CI_COMMIT_SHA: ${{ github.sha }}
CI_JOB_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}
# report to tinybird if executed on master
TINYBIRD_PYTEST_ARGS: "${{ github.repository == 'localstack/localstack' && github.ref == 'refs/heads/master' && '--report-to-tinybird ' || '' }}"
# report to tinybird if executed on main
TINYBIRD_PYTEST_ARGS: "${{ github.repository == 'localstack/localstack' && github.ref == 'refs/heads/main' && '--report-to-tinybird ' || '' }}"

permissions:
contents: read # checkout the repository
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
run: make test

push-to-tinybird:
if: always() && github.ref == 'refs/heads/master' && github.repository == 'localstack/localstack'
if: always() && github.ref == 'refs/heads/main' && github.repository == 'localstack/localstack'
runs-on: ubuntu-latest
needs: cli-tests
permissions:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tests-podman.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ env:
CI_COMMIT_BRANCH: ${{ github.head_ref || github.ref_name }}
CI_COMMIT_SHA: ${{ github.sha }}
CI_JOB_URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}/attempts/${{ github.run_attempt }}
# report to tinybird if executed on master
TINYBIRD_PYTEST_ARGS: "${{ github.repository == 'localstack/localstack' && github.ref == 'refs/heads/master' && '--report-to-tinybird ' || '' }}"
# report to tinybird if executed on main
TINYBIRD_PYTEST_ARGS: "${{ github.repository == 'localstack/localstack' && github.ref == 'refs/heads/main' && '--report-to-tinybird ' || '' }}"

jobs:
podman-tests:
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
DOCKER_HOST=$podmanSocket make test

push-to-tinybird:
if: always() && github.ref == 'refs/heads/master' && github.repository == 'localstack/localstack'
if: always() && github.ref == 'refs/heads/main' && github.repository == 'localstack/localstack'
runs-on: ubuntu-latest
needs: podman-tests
steps:
Expand Down
Loading
Loading