Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Backport 1.x] Use intermediate env var instead of interpolating directly in inline shell scripts #758

Merged
merged 1 commit into from
Aug 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions .github/workflows/bump-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ jobs:
token: ${{steps.github_app_token.outputs.token}}

- name: Bump Version
run: bash .github/bump-version.sh "${{github.event.inputs.version}}"
run: bash .github/bump-version.sh "$VERSION"
env:
VERSION: ${{github.event.inputs.version}}

- name: Create Pull Request
uses: peter-evans/create-pull-request@v5
Expand Down Expand Up @@ -121,7 +123,7 @@ jobs:
token: ${{steps.github_app_token.outputs.token}}

- name: Bump Patch Version
run: bash .github/bump-version.sh "${{env.NEXT_PATCH}}"
run: bash .github/bump-version.sh "$NEXT_PATCH"

- name: Create Patch Version Pull Request
uses: peter-evans/create-pull-request@v5
Expand All @@ -146,7 +148,7 @@ jobs:

- name: Bump Minor Version
if: env.IS_MINOR_BUMP == 'true'
run: bash .github/bump-version.sh "${{env.NEXT_MINOR}}"
run: bash .github/bump-version.sh "$NEXT_MINOR"

- name: Create Minor Version Pull Request
if: env.IS_MINOR_BUMP == 'true'
Expand All @@ -172,7 +174,7 @@ jobs:

- name: Bump Major Version
if: env.IS_MAJOR_BUMP == 'true'
run: bash .github/bump-version.sh "${{env.NEXT_MAJOR}}"
run: bash .github/bump-version.sh "$NEXT_MAJOR"

- name: Create Major Version Pull Request
if: env.IS_MAJOR_BUMP == 'true'
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integration-yaml-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,10 @@ jobs:

- name: Unpack OpenSearch
run: |
tar -xzf ${{ steps.opensearch_build.outputs.distribution }} \
tar -xzf "$DISTRIBUTION" \
&& ./opensearch-*/bin/opensearch-plugin install --batch file://$(realpath ./opensearch-security/build/distributions/opensearch-security-*-SNAPSHOT.zip)
env:
DISTRIBUTION: ${{ steps.opensearch_build.outputs.distribution }}

- name: Start OpenSearch
id: opensearch
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,11 @@ jobs:
restore-keys: |
${{ runner.os }}-nuget-

- run: "./build.sh integrate ${{ matrix.version }} readonly,replicatedreadonly,writable random:test_only_one --report"
- run: "./build.sh integrate $VERSION readonly,replicatedreadonly,writable random:test_only_one --report"
name: Integration Tests
working-directory: client
env:
VERSION: ${{ matrix.version }}

- name: Upload test report
if: failure()
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/test-jobs.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
name: Tests


on:
pull_request:
paths-ignore:
Expand Down
Loading