Skip to content

Commit

Permalink
Merge release/0.72.0 into dominik/test-base-branch
Browse files Browse the repository at this point in the history
  • Loading branch information
daxmobile authored Mar 2, 2024
2 parents 17fc67b + 4b61f09 commit d346f55
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/publish_dmg_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ jobs:

name: Tag public release

if: github.event.inputs.release-type != 'internal'
# Run if release-type is provided (not empty) an is not internal
if: contains(github.event.inputs.release-type, '') == false && github.event.inputs.release-type != 'internal'

uses: ./.github/workflows/tag_release.yml
with:
Expand Down Expand Up @@ -199,7 +200,6 @@ jobs:
AWS_ACCESS_KEY_ID: ${{ secrets.TEST_AWS_ACCESS_KEY_ID_RELEASE_S3 }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.TEST_AWS_SECRET_ACCESS_KEY_RELEASE_S3 }}
AWS_DEFAULT_REGION: ${{ vars.TEST_AWS_DEFAULT_REGION }}
RELEASE_TYPE: ${{ github.event.inputs.release-type }}
VERSION: ${{ steps.verify-tag.outputs.release-version }}
run: |
# Back up existing appcast2.xml
Expand All @@ -222,7 +222,7 @@ jobs:
- name: Update Asana for the release
id: update-asana
if: ${{ github.event.inputs.release-type != 'internal' }}
if: ${{ env.RELEASE_TYPE != 'internal' }}
continue-on-error: true
env:
ASANA_ACCESS_TOKEN: ${{ secrets.ASANA_ACCESS_TOKEN }}
Expand Down Expand Up @@ -292,7 +292,7 @@ jobs:

- name: Create Asana task to announce the release
id: create-announcement-task
if: ${{ github.event.inputs.release-type != 'internal' }}
if: ${{ env.RELEASE_TYPE != 'internal' }}
uses: ./.github/actions/asana-create-action-item
env:
html-notes: ${{ steps.update-asana.outputs.announcement-task-contents }}
Expand Down Expand Up @@ -356,7 +356,8 @@ jobs:

needs: [publish-to-sparkle]

if: ${{ github.event.inputs.release-type != 'internal' }}
# Run if release-type is provided (not empty) an is not internal
if: contains(github.event.inputs.release-type, '') == false && github.event.inputs.release-type != 'internal'

uses: ./.github/workflows/create_variants.yml
secrets:
Expand Down
2 changes: 1 addition & 1 deletion Configuration/BuildNumber.xcconfig
Original file line number Diff line number Diff line change
@@ -1 +1 @@
CURRENT_PROJECT_VERSION = 155
CURRENT_PROJECT_VERSION = 156

0 comments on commit d346f55

Please sign in to comment.