Skip to content

Commit ad724d2

Browse files
committed
init
1 parent 7c1b0da commit ad724d2

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/release_cli.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ jobs:
7878
- name: Update CLI version
7979
uses: ./.github/actions/update_version
8080
# only empty during testing
81-
if: github.event.inputs.release_tag != ''
81+
if: ${{ github.event.inputs.release_tag != '' || inputs.release_tag != '' }}
8282
with:
83-
version: ${{ github.event.inputs.release_tag }}
83+
version: ${{ github.event.inputs.release_tag || inputs.release_tag }}
8484
file: ./cli/Cargo.toml
8585

8686
#########################################################
@@ -103,7 +103,7 @@ jobs:
103103
- name: Upload debug info to Sentry
104104
uses: ./.github/actions/upload_sentry_debug_info
105105
# only empty during testing
106-
if: github.event.inputs.release_tag != ''
106+
if: ${{ github.event.inputs.release_tag != '' || inputs.release_tag != '' }}
107107
with:
108108
target: ${{ matrix.platform.target }}
109109
sentry-org: ${{ secrets.SENTRY_ORG }}
@@ -119,7 +119,7 @@ jobs:
119119
with:
120120
target: ${{ matrix.platform.target }}
121121
os-name: ${{ matrix.platform.os-name }}
122-
release_tag: ${{ github.event.inputs.release_tag }}
122+
release_tag: ${{ github.event.inputs.release_tag || inputs.release_tag }}
123123

124124
#########################################################
125125
# Upload CLI artifacts
@@ -192,7 +192,7 @@ jobs:
192192
if-no-files-found: error
193193

194194
perform_smoke_test:
195-
name: Smoke test ${{ github.event.inputs.release_tag }} - ${{ matrix.type.name }}
195+
name: Smoke test ${{ github.event.inputs.release_tag || inputs.release_tag }} - ${{ matrix.type.name }}
196196
runs-on: ${{ matrix.type.os }}
197197
strategy:
198198
matrix:
@@ -238,11 +238,11 @@ jobs:
238238
production-api-token: ${{ secrets.TRUNK_PROD_ORG_API_TOKEN }}
239239

240240
tag_and_release:
241-
name: Tag and Release [ ${{ github.event.inputs.release_tag }} ]
241+
name: Tag and Release [ ${{ github.event.inputs.release_tag || inputs.release_tag }} ]
242242
runs-on: ubuntu-latest
243243
needs: [build_release, perform_smoke_test]
244244
# only empty during testing
245-
if: needs.perform_smoke_test.result == 'success' && github.event.inputs.release_tag != ''
245+
if: ${{ needs.perform_smoke_test.result == 'success' && (github.event.inputs.release_tag != '' || inputs.release_tag != '') }}
246246
steps:
247247
- uses: actions/checkout@v4
248248

@@ -305,7 +305,7 @@ jobs:
305305
run: |
306306
gh release create --prerelease --latest=false \
307307
--target ${{ github.sha }} \
308-
--generate-notes ${{ github.event.inputs.release_tag }} \
308+
--generate-notes ${{ github.event.inputs.release_tag || inputs.release_tag }} \
309309
./build/*.tar.gz ./build/*.zip
310310
311311
- name: Create Sentry release
@@ -316,4 +316,4 @@ jobs:
316316
SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
317317
with:
318318
environment: production
319-
version: ${{ github.event.inputs.release_tag }}
319+
version: ${{ github.event.inputs.release_tag || inputs.release_tag }}

.github/workflows/release_ruby_gem.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,21 @@ jobs:
6565
uses: ./.github/actions/update_version
6666
if: "!cancelled()"
6767
with:
68-
version: ${{ github.event.inputs.release_tag }}
68+
version: ${{ github.event.inputs.release_tag || inputs.release_tag }}
6969
file: ./cli/Cargo.toml
7070

7171
- name: Update Test Report version
7272
uses: ./.github/actions/update_version
7373
if: "!cancelled()"
7474
with:
75-
version: ${{ github.event.inputs.release_tag }}
75+
version: ${{ github.event.inputs.release_tag || inputs.release_tag }}
7676
file: ./test_report/Cargo.toml
7777

7878
- name: Update Gem version
7979
uses: ./.github/actions/update_version
8080
if: "!cancelled()"
8181
with:
82-
version: ${{ github.event.inputs.release_tag }}
82+
version: ${{ github.event.inputs.release_tag || inputs.release_tag }}
8383
file: rspec-trunk-flaky-tests/rspec_trunk_flaky_tests.gemspec
8484

8585
- uses: oxidize-rb/actions/cross-gem@v1

0 commit comments

Comments
 (0)