diff --git a/.github/workflows/auto-pr-dev-to-main.yml b/.github/workflows/auto-pr-dev-to-main.yml new file mode 100644 index 0000000000..cb3be1d24b --- /dev/null +++ b/.github/workflows/auto-pr-dev-to-main.yml @@ -0,0 +1,22 @@ +name: Create PR from dev to main +on: + pull_request: + types: [closed] + branches: + - dev + +jobs: + pull-request: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: pull-request + uses: repo-sync/pull-request@v2 + if: github.event.pull_request.merged == true + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + source_branch: '' + destination_branch: 'main' + pr_title: 'QA Handover PR' + pr_body: ':robot: Automated PR from **${{ github.ref }}** to **main**' + pr_label: 'release' diff --git a/.github/workflows/auto-pr-prebuilt-branch.yml b/.github/workflows/auto-pr-main-to-dev.yml similarity index 66% rename from .github/workflows/auto-pr-prebuilt-branch.yml rename to .github/workflows/auto-pr-main-to-dev.yml index fa6b42d019..482d5df6ea 100644 --- a/.github/workflows/auto-pr-prebuilt-branch.yml +++ b/.github/workflows/auto-pr-main-to-dev.yml @@ -1,4 +1,4 @@ -name: Create PR from main to main-prebuilt +name: Create PR from main to dev on: pull_request: types: [closed] @@ -16,7 +16,7 @@ jobs: with: github_token: ${{ secrets.GITHUB_TOKEN }} source_branch: '' - destination_branch: 'main-prebuilt' - pr_title: 'PR for Prebuilt Link QA deployment' - pr_body: ':robot: Automated PR from **${{ github.ref }}** to **main-prebuilt**' - pr_label: 'Prebuilt Link QA deployment' + destination_branch: 'dev' + pr_title: 'PR for main to dev backmerge' + pr_body: ':robot: Automated PR from **${{ github.ref }}** to **dev**' + pr_label: 'backmerge' diff --git a/.github/workflows/auto-pr-main-to-production.yml b/.github/workflows/auto-pr-main-to-production.yml new file mode 100644 index 0000000000..3beffc66e0 --- /dev/null +++ b/.github/workflows/auto-pr-main-to-production.yml @@ -0,0 +1,22 @@ +name: Create PR from main to production +on: + pull_request: + types: [closed] + branches: + - main + +jobs: + pull-request: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: pull-request + uses: repo-sync/pull-request@v2 + if: github.event.pull_request.merged == true + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + source_branch: '' + destination_branch: 'production' + pr_title: 'Production release PR' + pr_body: ':robot: Automated PR from **${{ github.ref }}** to **production**' + pr_label: 'release' diff --git a/.github/workflows/auto-pr-production-to-main.yml b/.github/workflows/auto-pr-production-to-main.yml new file mode 100644 index 0000000000..010122df82 --- /dev/null +++ b/.github/workflows/auto-pr-production-to-main.yml @@ -0,0 +1,22 @@ +name: Create PR from production to main +on: + pull_request: + types: [closed] + branches: + - production + +jobs: + pull-request: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v1 + - name: pull-request + uses: repo-sync/pull-request@v2 + if: github.event.pull_request.merged == true + with: + github_token: ${{ secrets.GITHUB_TOKEN }} + source_branch: '' + destination_branch: 'main' + pr_title: 'Hotfix backmerge to main' + pr_body: ':robot: Automated PR from **${{ github.ref }}** to **main**' + pr_label: 'backmerge' diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml index 703bc8e13d..ee61e44764 100644 --- a/.github/workflows/deploy-dev.yml +++ b/.github/workflows/deploy-dev.yml @@ -1,15 +1,14 @@ name: Deploy Dev on: workflow_dispatch: - inputs: - buildEnvForDev: - description: 'which env to build - qa/prod for dev-app, applies only if env is dev' - type: 'choice' - required: false - default: prod - options: - - prod - - qa + push: + branches: + - dev + paths-ignore: + - 'cypress/**' + - 'playwright/**' + - 'internal-docs/**' + - '.github/**' jobs: build: @@ -38,9 +37,9 @@ jobs: REACT_APP_ENV: ${{ github.event.inputs.buildEnvForDev }} REACT_APP_ZIPY_KEY: ${{ secrets.ZIPY_KEY }} REACT_APP_ENABLE_BEAM_SPEAKERS_LOGGING: 'true' - REACT_APP_INIT_ENDPOINT: https://qa-init.100ms.live/init - REACT_APP_ROOM_LAYOUT_ENDPOINT: https://api-nonprod.100ms.live/v2/layouts/ui - REACT_APP_TOKEN_BY_ROOM_CODE_ENDPOINT: https://auth-nonprod.100ms.live/v2/token + REACT_APP_INIT_ENDPOINT: https://prod-in3.100ms.live/init + REACT_APP_ROOM_LAYOUT_ENDPOINT: https://api.100ms.live/v2/layouts/ui + REACT_APP_TOKEN_BY_ROOM_CODE_ENDPOINT: https://auth.100ms.live/v2/token steps: - name: log inputs run: |