diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 25cd18724..3a241d807 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -13,9 +13,9 @@ name: "CodeQL Advanced" on: push: - branches: [ "develop" ] + branches: [ "main" ] pull_request: - branches: [ "develop" ] + branches: [ "main" ] schedule: - cron: '20 7 * * 0' diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index d15752461..1c9663945 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -1,9 +1,9 @@ name: Dev on: push: - branches: [ develop ] + branches: [ main ] pull_request: - branches: [ develop ] + branches: [ main ] concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/main-docker.yml b/.github/workflows/main-docker.yml index 53c0ae71f..0327ed1b7 100644 --- a/.github/workflows/main-docker.yml +++ b/.github/workflows/main-docker.yml @@ -1,7 +1,7 @@ on: push: branches: - - "develop" + - "main" - "feature/update**" - "feature/server_esm**" paths-ignore: diff --git a/nx.json b/nx.json index c457d117b..927089448 100644 --- a/nx.json +++ b/nx.json @@ -1,6 +1,6 @@ { "$schema": "./node_modules/nx/schemas/nx-schema.json", - "defaultBase": "develop", + "defaultBase": "main", "namedInputs": { "default": [ "{projectRoot}/**/*",