Skip to content

Commit daa95a8

Browse files
cleaned up actions
1 parent 3d458c7 commit daa95a8

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

.github/workflows/dev-workflow.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
]
4141
uses: ./.github/workflows/dev-upload-addons-to-jfrog.yml
4242
with:
43-
new_version: ${{ needs.bump-dev-number.outputs.dev_version }}
43+
new_version: 6.3.0-dev.53
4444
secrets: inherit
4545

4646
upload-npm-package-to-jfrog:
@@ -52,6 +52,6 @@ jobs:
5252
]
5353
uses: ./.github/workflows/shared-upload-npm-package-to-jfrog.yml
5454
with:
55-
new_version: ${{ needs.bump-dev-number.outputs.dev_version }}
55+
new_version: 6.3.0-dev.53
5656
pipeline-stage: 'dev'
5757
secrets: inherit

.github/workflows/stage-comprehensive-tests.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
server-tag:
2929
required: false
3030
type: string
31-
default: '8.1.0.0-rc5'
31+
default: '8.1.0.0'
3232
description: 'Server docker image tag'
3333
secrets:
3434
soup_hat:
@@ -67,10 +67,8 @@ jobs:
6767
runs-on: ${{ needs.get-runner-os.outputs.runner-os }}
6868
env:
6969
BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}"
70-
MACOS_OPENSSL_VERSION: 3
7170
steps:
7271

73-
# REUSABLE PART
7472
- name: Create status check message
7573
run: echo STATUS_CHECK_MESSAGE="test-ee (${{ env.BUILD_IDENTIFIER }})" >> $GITHUB_ENV
7674
shell: bash
@@ -85,14 +83,13 @@ jobs:
8583
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
8684
with:
8785
submodules: recursive
88-
# We need the last tag before the ref, so we can relabel the version if needed
8986
fetch-depth: 0
9087

9188
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
9289
with:
9390
node-version: ${{ matrix.nodejs-tag[1] }}
9491

95-
- name: 'Windows: Install C client deps'
92+
- name: Windows: Install C client deps
9693
if: ${{ inputs.platform-tag == 'win_amd64' }}
9794
run: nuget restore
9895
working-directory: aerospike-client-c/vs
@@ -240,7 +237,6 @@ jobs:
240237
# runs-on: ${{ needs.get-runner-os.outputs.runner-os }}
241238
# env:
242239
# BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}"
243-
# MACOS_OPENSSL_VERSION: 3
244240
# steps:
245241
#
246242
# # REUSABLE PART
@@ -375,7 +371,6 @@ jobs:
375371
runs-on: ${{ needs.get-runner-os.outputs.runner-os }}
376372
env:
377373
BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}"
378-
MACOS_OPENSSL_VERSION: 3
379374
steps:
380375

381376
# REUSABLE PART
@@ -498,7 +493,6 @@ jobs:
498493
runs-on: ${{ needs.get-runner-os.outputs.runner-os }}
499494
env:
500495
BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}"
501-
MACOS_OPENSSL_VERSION: 3
502496
steps:
503497

504498
# REUSABLE PART
@@ -660,7 +654,6 @@ jobs:
660654
runs-on: ${{ needs.get-runner-os.outputs.runner-os }}
661655
env:
662656
BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}"
663-
MACOS_OPENSSL_VERSION: 3
664657
steps:
665658

666659

@@ -785,7 +778,6 @@ jobs:
785778
if: ${{ inputs.run_tests && ( inputs.platform-tag != 'macosx_x86_64' ) }}
786779
env:
787780
BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}"
788-
MACOS_OPENSSL_VERSION: 3
789781
steps:
790782

791783
# REUSABLE PART
@@ -898,7 +890,6 @@ jobs:
898890
runs-on: ${{ needs.get-runner-os.outputs.runner-os }}
899891
env:
900892
BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}"
901-
MACOS_OPENSSL_VERSION: 3
902893
steps:
903894

904895
# REUSABLE PART
@@ -1000,7 +991,6 @@ jobs:
1000991
# runs-on: ${{ needs.get-runner-os.outputs.runner-os }}
1001992
# env:
1002993
# BUILD_IDENTIFIER: "${{ matrix.nodejs-tag[0] }}-${{ inputs.platform-tag }}"
1003-
# MACOS_OPENSSL_VERSION: 3
1004994
# steps:
1005995
#
1006996
# # REUSABLE PART

.github/workflows/stage-workflow.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ jobs:
2929
comprehensive-tests:
3030
uses: ./.github/workflows/stage-tests.yml
3131
with:
32-
version: ${{ needs.get-jfrog-dev-version.outputs.dev_version }}
32+
version: ${{ needs.stage-get-jfrog-version.dev_version }}
3333
run_tests: true
3434
needs: [
3535
stage-get-jfrog-version,
3636
]
3737
secrets: inherit
3838

3939
bump-stage-number:
40-
uses: ./.github/workflows/bump-stage-version.yml
40+
uses: ./.github/workflows/stage-bump-version.yml
4141
needs: [
4242
stage-get-jfrog-version,
4343
comprehensive-test,
@@ -53,8 +53,8 @@ jobs:
5353
]
5454
uses: ./.github/workflows/shared-reupload-addons-to-jfrog.yml
5555
with:
56-
old_version: ${{ needs.get-jfrog-dev-version.outputs.dev_version }}
57-
new_version: ${{ needs.bump-dev-number.outputs.new_stage_version }}
56+
old_version: ${{ needs.stage-get-jfrog-version.outputs.dev_version }}
57+
new_version: ${{ needs.bump-stage-number.outputs.new_stage_version }}
5858
pipeline-stage: 'stage'
5959
secrets: inherit
6060

@@ -68,6 +68,6 @@ jobs:
6868
]
6969
uses: ./.github/workflows/shared-upload-npm-package-to-jfrog.yml
7070
with:
71-
new_version: ${{ needs.bump-dev-number.outputs.new_stage_version }}
71+
new_version: ${{ needs.bump-stage-number.outputs.new_stage_version }}
7272
pipeline-stage: 'stage'
7373
secrets: inherit

0 commit comments

Comments
 (0)