diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml index d450b9a..d53126d 100644 --- a/.github/workflows/build-docker.yaml +++ b/.github/workflows/build-docker.yaml @@ -4,7 +4,7 @@ on: pull_request: types: [labeled, synchronize] branches: - - master + - main - release/* push: tags: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce3cc49..c6e67fb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,10 +2,10 @@ name: Public CI on: push: - branches: [master] + branches: [main] pull_request: branches: - - master + - main concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} diff --git a/Makefile b/Makefile index f33ce30..7adb3e7 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ QUAKE := cargo run --bin quake -- LOAD_PREDEFINED_ARC_REMOTE_SIGNER_KEYS := true DEFAULT_BRANCH ?= $(shell git symbolic-ref refs/remotes/origin/HEAD 2>/dev/null | sed 's@^refs/remotes/origin/@@') ifeq ($(DEFAULT_BRANCH),) -DEFAULT_BRANCH = master +DEFAULT_BRANCH = main endif ##@ Help