diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eed88ef68..3c2277f70 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,6 +9,10 @@ on: # Allows you to run this workflow manually from the Actions tab workflow_dispatch: +env: + # Make the git branch for a PR available to our Fastfile + MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }} + jobs: build: name: Build @@ -39,7 +43,7 @@ jobs: bundle config path vendor/bundle bundle install --jobs 4 --retry 3 - name: Use right MatrixKit and MatrixSDK versions - run: bundle exec fastlane point_dependencies_to_pending_releases + run: bundle exec fastlane point_dependencies_to_related_branches # Main step - name: Build iOS simulator @@ -75,7 +79,7 @@ jobs: bundle config path vendor/bundle bundle install --jobs 4 --retry 3 - name: Use right MatrixKit and MatrixSDK versions - run: bundle exec fastlane point_dependencies_to_pending_releases + run: bundle exec fastlane point_dependencies_to_related_branches # Main step - name: Unit tests diff --git a/CHANGES.rst b/CHANGES.rst index 208a9fd17..e2144d28f 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -19,7 +19,7 @@ Changes to be released in next version * 🧱 Build - * + * GH Actions: Make jobs use the right version of MatrixKit and MatrixSDK. Others *