Skip to content

Commit

Permalink
Merge branch 'dominik/release-task-description' into dominik/test-bas…
Browse files Browse the repository at this point in the history
…e-branch-2
  • Loading branch information
ayoy committed Feb 14, 2024
2 parents f693752 + 4103fc7 commit b0221c9
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 28 deletions.
47 changes: 20 additions & 27 deletions .github/workflows/bump_internal_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ on:

jobs:

update_embedded_files:
assert_release_branch:

name: Update Embedded Files
name: Assert Release Branch

runs-on: macos-13-xlarge
runs-on: ubuntu-latest
timeout-minutes: 10

steps:
Expand All @@ -30,32 +30,11 @@ jobs:
*) echo "👎 Not a release branch"; exit 1 ;;
esac
- name: Check out the code
uses: actions/checkout@v4
with:
submodules: recursive

- name: Select Xcode
run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer

- name: Prepare fastlane
run: bundle install

- name: Update embedded files
env:
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 }}
run: |
git config --global user.name "Dax the Duck"
git config --global user.email "[email protected]"
bundle exec fastlane update_embedded_files
# run_tests:

# name: Run Tests

# needs: update_embedded_files
# needs: assert_release_branch
# uses: ./.github/workflows/pr.yml
# secrets:
# ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
Expand All @@ -64,7 +43,7 @@ jobs:

name: Increment Build Number

needs: update_embedded_files
needs: assert_release_branch
runs-on: macos-13-xlarge
timeout-minutes: 10

Expand All @@ -73,8 +52,9 @@ jobs:
- name: Check out the code
uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0 # Fetch all history and tags in order to extract Asana task URLs from git log
ref: ${{ github.ref_name }}
submodules: recursive

- name: Select Xcode
run: sudo xcode-select -s /Applications/Xcode_$(<.xcode-version).app/Contents/Developer
Expand All @@ -92,6 +72,19 @@ jobs:
git config --global user.email "[email protected]"
bundle exec fastlane bump_internal_release update_embedded_files:false
- name: Extract Asana Task ID
id: task-id
uses: ./.github/actions/asana-extract-task-id
with:
task-url: ${{ github.event.inputs.asana-task-url }}

- name: Populate release contents
env:
ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
GH_TOKEN: ${{ github.token }}
run: |
./scripts/update_this_release_includes.sh ${{ steps.task-id.outputs.task-id }}
prepare_release:
name: Prepare Release
needs: increment_build_number
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/code_freeze.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
- name: Check out the code
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-depth: 0 # Fetch all history and tags in order to extract Asana task URLs from git log
submodules: recursive

- name: Prepare fastlane
Expand Down

0 comments on commit b0221c9

Please sign in to comment.