diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 7532a3746..d4678e6c9 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: "CodeQL" on: push: - branches: [ develop, main ] + branches: [ main ] pull_request: # The branches below must be a subset of the branches above - branches: [ develop ] + branches: [ main ] schedule: - cron: '21 7 * * 0' diff --git a/.github/workflows/desktop.release.beta.yml b/.github/workflows/desktop.release.beta.yml deleted file mode 100644 index fb79f7dc5..000000000 --- a/.github/workflows/desktop.release.beta.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Desktop Beta Release - -on: - push: - tags: - - '*standardnotes/*desktop*beta*' - - '*standardnotes/*desktop*alpha*' - - '!*standardnotes/*inner-desktop*' - workflow_dispatch: - -jobs: - Build: - uses: standardnotes/app/.github/workflows/desktop.release.reuse.yml@develop - secrets: inherit - with: - channel: beta \ No newline at end of file diff --git a/.github/workflows/desktop.release.prod.yml b/.github/workflows/desktop.release.prod.yml index 20f741458..38d05690c 100644 --- a/.github/workflows/desktop.release.prod.yml +++ b/.github/workflows/desktop.release.prod.yml @@ -1,11 +1,9 @@ -name: Desktop Prod Release +name: Desktop Release on: push: tags: - '*standardnotes/*desktop*' - - '!*standardnotes/*desktop*beta*' - - '!*standardnotes/*desktop*alpha*' - '!*standardnotes/*inner-desktop*' workflow_dispatch: diff --git a/.github/workflows/mobile.release.prod.yml b/.github/workflows/mobile.release.prod.yml index 2f35b5e26..a92efe337 100644 --- a/.github/workflows/mobile.release.prod.yml +++ b/.github/workflows/mobile.release.prod.yml @@ -1,11 +1,9 @@ -name: Mobile Build Production +name: Mobile Release Production on: push: tags: - '*standardnotes/mobile*' - - '!*standardnotes/mobile*beta*' - - '!*standardnotes/mobile*alpha*' workflow_dispatch: jobs: diff --git a/.github/workflows/mobile.release.dev.yml b/.github/workflows/mobile.release.test.yml similarity index 97% rename from .github/workflows/mobile.release.dev.yml rename to .github/workflows/mobile.release.test.yml index 350dcbbca..8af0b46d6 100644 --- a/.github/workflows/mobile.release.dev.yml +++ b/.github/workflows/mobile.release.test.yml @@ -1,10 +1,6 @@ -name: Mobile Build Development +name: Mobile TestFlight on: - push: - tags: - - '*standardnotes/*mobile*beta*' - - '*standardnotes/*mobile*alpha*' workflow_dispatch: jobs: diff --git a/.github/workflows/mobile.test.yml b/.github/workflows/mobile.test.yml deleted file mode 100644 index 881cfc36f..000000000 --- a/.github/workflows/mobile.test.yml +++ /dev/null @@ -1,73 +0,0 @@ -name: Mobile e2e - -on: [workflow_dispatch] - -jobs: - android: - defaults: - run: - working-directory: ./packages/mobile - runs-on: macos-latest - timeout-minutes: 30 - steps: - - name: Checkout - uses: actions/checkout@v2 - with: - fetch-depth: 1 - - - name: Download Android Emulator Image - run: | - $ANDROID_HOME/tools/bin/sdkmanager --install "system-images;android-28;default;x86_64" - $ANDROID_HOME/tools/bin/avdmanager create avd -n pixel -d "Nexus 5X" --package "system-images;android-28;default;x86_64" - - - name: Install Dependencies - run: yarn install - - - name: Add usesCleartextTraffic to release AndroidManifest.xml - run: yarn replace-in-file ' task-definition.json - - - name: Fill in the new image ID in the Amazon ECS task definition - id: task-def - uses: aws-actions/amazon-ecs-render-task-definition@v1 - with: - task-definition: task-definition.json - container-name: app-beta-dev - image: "standardnotes/web:${{ github.sha }}" - - - name: Deploy Amazon ECS task definition - uses: aws-actions/amazon-ecs-deploy-task-definition@v1 - with: - task-definition: ${{ steps.task-def.outputs.task-definition }} - service: app-beta-dev - cluster: dev - wait-for-service-stability: true - - notify_discord: - needs: deploy - - runs-on: ubuntu-latest - - steps: - - name: Run Discord Webhook - uses: johnnyhuy/actions-discord-git-webhook@main - with: - webhook_url: ${{ secrets.DISCORD_WEBHOOK_URL }} diff --git a/.github/workflows/web.release.prod.yml b/.github/workflows/web.release.prod.yml index 2330a183a..b56fd82c2 100644 --- a/.github/workflows/web.release.prod.yml +++ b/.github/workflows/web.release.prod.yml @@ -1,4 +1,4 @@ -name: Web Server Prod +name: Web Server Deploy concurrency: group: prod_environment diff --git a/.github/workflows/web.release.dev.yml b/.github/workflows/web.release.test.yml similarity index 94% rename from .github/workflows/web.release.dev.yml rename to .github/workflows/web.release.test.yml index 7038b3152..eb2c75a31 100644 --- a/.github/workflows/web.release.dev.yml +++ b/.github/workflows/web.release.test.yml @@ -1,14 +1,10 @@ -name: Web Server Dev +name: Web Server TestFlight concurrency: group: dev_environment cancel-in-progress: true on: - push: - tags: - - '*standardnotes/*web-server*beta*' - - '*standardnotes/*web-server*alpha*' workflow_dispatch: jobs: diff --git a/package.json b/package.json index d449c9eae..d6eafddc3 100644 --- a/package.json +++ b/package.json @@ -26,11 +26,8 @@ "start:server:web:localhost": "lerna run start:no-binding --scope=@standardnotes/web-server", "prepare": "husky install", "reset": "find . -type dir -name node_modules | xargs rm -rf && rm -rf yarn.lock && yarn install", - "release:prod": "lerna version --conventional-commits --yes -m \"chore(release): publish main\"", - "release:prod:graduate": "lerna version --conventional-graduate --conventional-commits --yes -m \"chore(release): publish main\"", - "release:beta": "lerna version --conventional-prerelease --conventional-commits --yes -m \"chore(release): publish\"", + "release:prod": "lerna version --conventional-commits --yes -m \"chore(release): publish\"", "publish:prod": "lerna publish from-git --yes", - "publish:beta": "lerna publish from-git --yes --dist-tag alpha", "version": "yarn install --no-immutable && git add yarn.lock", "postversion": "./scripts/push-tags-one-by-one.sh", "lerna:list": " yarn lerna list -all",