diff --git a/.github/workflows/bump_internal_release.yml b/.github/workflows/bump_internal_release.yml index ae339d2171..f57ad6c44a 100644 --- a/.github/workflows/bump_internal_release.yml +++ b/.github/workflows/bump_internal_release.yml @@ -51,20 +51,20 @@ jobs: git config --global user.email "dax@duckduckgo.com" bundle exec fastlane update_embedded_files - run_tests: + # run_tests: - name: Run Tests + # name: Run Tests - needs: update_embedded_files - uses: ./.github/workflows/pr.yml - secrets: - ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} + # needs: update_embedded_files + # uses: ./.github/workflows/pr.yml + # secrets: + # ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} increment_build_number: name: Increment Build Number - needs: run_tests + needs: update_embedded_files runs-on: macos-13-xlarge timeout-minutes: 10 diff --git a/.github/workflows/code_freeze.yml b/.github/workflows/code_freeze.yml index a6502013af..21dc12eb34 100644 --- a/.github/workflows/code_freeze.yml +++ b/.github/workflows/code_freeze.yml @@ -18,12 +18,12 @@ jobs: steps: - - name: Assert main branch - run: | - if [ "${{ github.ref_name }}" != "main" ]; then - echo "👎 Not the main branch" - exit 1 - fi + # - name: Assert main branch + # run: | + # if [ "${{ github.ref_name }}" != "main" ]; then + # echo "👎 Not the main branch" + # exit 1 + # fi - name: Check out the code uses: actions/checkout@v4 @@ -82,20 +82,21 @@ jobs: run_tests: - name: Run Tests + # name: Run Tests - needs: create_release_branch - uses: ./.github/workflows/pr.yml - with: - branch: ${{ needs.create_release_branch.outputs.release_branch_name }} - secrets: - ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} + # needs: create_release_branch + # uses: ./.github/workflows/pr.yml + # with: + # branch: ${{ needs.create_release_branch.outputs.release_branch_name }} + # secrets: + # ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} increment_build_number: name: Increment Build Number - needs: [ create_release_branch, run_tests ] + # needs: [ create_release_branch, run_tests ] + needs: [ create_release_branch ] runs-on: macos-13-xlarge timeout-minutes: 10 @@ -161,6 +162,7 @@ jobs: with: asana-task-url: ${{ needs.create_release_branch.outputs.asana_task_url }} branch: ${{ needs.create_release_branch.outputs.release_branch_name }} + base-branch: ${{ github.ref_name }} secrets: ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} GHA_ELEVATED_PERMISSIONS_TOKEN: ${{ secrets.GHA_ELEVATED_PERMISSIONS_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 276e195e31..6fbb50597e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -104,21 +104,21 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY_RELEASE_S3: ${{ secrets.AWS_SECRET_ACCESS_KEY_RELEASE_S3 }} - appstore-release: - name: Prepare AppStore Release - uses: ./.github/workflows/build_appstore.yml - with: - destination: appstore - asana-task-url: ${{ github.event.inputs.asana-task-url || inputs.asana-task-url }} - branch: ${{ inputs.branch }} - secrets: - SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }} - APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} - APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} - APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }} - MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} - ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} - MM_HANDLES_BASE64: ${{ secrets.MM_HANDLES_BASE64 }} - MM_WEBHOOK_URL: ${{ secrets.MM_WEBHOOK_URL }} - AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} - AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} + # appstore-release: + # name: Prepare AppStore Release + # uses: ./.github/workflows/build_appstore.yml + # with: + # destination: appstore + # asana-task-url: ${{ github.event.inputs.asana-task-url || inputs.asana-task-url }} + # branch: ${{ inputs.branch }} + # secrets: + # SSH_PRIVATE_KEY_FASTLANE_MATCH: ${{ secrets.SSH_PRIVATE_KEY_FASTLANE_MATCH }} + # APPLE_API_KEY_BASE64: ${{ secrets.APPLE_API_KEY_BASE64 }} + # APPLE_API_KEY_ID: ${{ secrets.APPLE_API_KEY_ID }} + # APPLE_API_KEY_ISSUER: ${{ secrets.APPLE_API_KEY_ISSUER }} + # MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }} + # ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }} + # MM_HANDLES_BASE64: ${{ secrets.MM_HANDLES_BASE64 }} + # MM_WEBHOOK_URL: ${{ secrets.MM_WEBHOOK_URL }} + # AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} + # AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }} diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 6725154913..ccec15b04b 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -374,7 +374,7 @@ platform :mac do private_lane :macos_codefreeze_prechecks do ensure_git_status_clean - ensure_git_branch(branch: DEFAULT_BRANCH) + # ensure_git_branch(branch: DEFAULT_BRANCH) git_pull git_submodule_update(recursive: true, init: true)