Skip to content

Commit 9bb1936

Browse files
committed
change logic
1 parent 2c00aca commit 9bb1936

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

.github/workflows/build_test.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,9 @@ jobs:
184184
- name: Setup private key file
185185
shell: bash
186186
env:
187-
PYTHON_PRIVATE_KEY_SECRET: ${{ secrets.PYTHON_PRIVATE_KEY_SECRET }}
187+
PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
188188
run: |
189-
gpg --quiet --batch --yes --decrypt --passphrase="$PYTHON_PRIVATE_KEY_SECRET" \
189+
gpg --quiet --batch --yes --decrypt --passphrase="$PARAMETERS_SECRET" \
190190
.github/workflows/parameters/public/rsa_keys/rsa_key_python_${{ matrix.cloud-provider }}.p8.gpg > test/rsa_key_python_${{ matrix.cloud-provider }}.p8
191191
- name: Download wheel(s)
192192
uses: actions/download-artifact@v4
@@ -262,9 +262,9 @@ jobs:
262262
- name: Setup private key file
263263
shell: bash
264264
env:
265-
PYTHON_PRIVATE_KEY_SECRET: ${{ secrets.PYTHON_PRIVATE_KEY_SECRET }}
265+
PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
266266
run: |
267-
gpg --quiet --batch --yes --decrypt --passphrase="$PYTHON_PRIVATE_KEY_SECRET" \
267+
gpg --quiet --batch --yes --decrypt --passphrase="$PARAMETERS_SECRET" \
268268
.github/workflows/parameters/public/rsa_keys/rsa_key_python_${{ matrix.cloud-provider }}.p8.gpg > test/rsa_key_python_${{ matrix.cloud-provider }}.p8
269269
- name: Upgrade setuptools, pip and wheel
270270
run: python -m pip install -U setuptools pip wheel
@@ -330,9 +330,9 @@ jobs:
330330
- name: Setup private key file
331331
shell: bash
332332
env:
333-
PYTHON_PRIVATE_KEY_SECRET: ${{ secrets.PYTHON_PRIVATE_KEY_SECRET }}
333+
PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
334334
run: |
335-
gpg --quiet --batch --yes --decrypt --passphrase="$PYTHON_PRIVATE_KEY_SECRET" \
335+
gpg --quiet --batch --yes --decrypt --passphrase="$PARAMETERS_SECRET" \
336336
.github/workflows/parameters/public/rsa_keys/rsa_key_python_${{ matrix.cloud-provider }}.p8.gpg > test/rsa_key_python_${{ matrix.cloud-provider }}.p8
337337
- name: Download wheel(s)
338338
uses: actions/download-artifact@v4
@@ -390,9 +390,9 @@ jobs:
390390
- name: Setup private key file
391391
shell: bash
392392
env:
393-
PYTHON_PRIVATE_KEY_SECRET: ${{ secrets.PYTHON_PRIVATE_KEY_SECRET }}
393+
PARAMETERS_SECRET: ${{ secrets.PARAMETERS_SECRET }}
394394
run: |
395-
gpg --quiet --batch --yes --decrypt --passphrase="$PYTHON_PRIVATE_KEY_SECRET" \
395+
gpg --quiet --batch --yes --decrypt --passphrase="$PARAMETERS_SECRET" \
396396
.github/workflows/parameters/public/rsa_keys/rsa_key_python_${{ matrix.cloud-provider }}.p8.gpg > test/rsa_key_python_${{ matrix.cloud-provider }}.p8
397397
- name: Download wheel(s)
398398
uses: actions/download-artifact@v4
Binary file not shown.
Binary file not shown.
Binary file not shown.

ci/test_darwin.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ PARAMS_FILE="${PARAMETERS_DIR}/parameters_aws.py.gpg"
2020
gpg --quiet --batch --yes --decrypt --passphrase="${PARAMETERS_SECRET}" ${PARAMS_FILE} > test/parameters.py
2121

2222
# Decrypt private key file
23-
gpg --quiet --batch --yes --decrypt --passphrase="${PYTHON_PRIVATE_KEY_SECRET}" "${CONNECTOR_DIR}/.github/workflows/parameters/public/rsa_keys/rsa_key_python_${cloud_provider}.p8.gpg" > "test/rsa_key_python_${cloud_provider}.p8"
23+
gpg --quiet --batch --yes --decrypt --passphrase="${PARAMETERS_SECRET}" "${CONNECTOR_DIR}/.github/workflows/parameters/public/rsa_keys/rsa_key_python_${cloud_provider}.p8.gpg" > "test/rsa_key_python_${cloud_provider}.p8"
2424

2525
rm -rf venv
2626
python3.12 -m venv venv

ci/test_windows.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ echo %connector_whl%
2222

2323
:: Decrypt parameters file and private key file
2424
:: Default to aws as cloud provider
25+
if "%cloud_provider%"=="" set cloud_provider=aws
2526
set PARAMETERS_DIR=%CONNECTOR_DIR%\.github\workflows\parameters\public
2627
set PARAMS_FILE=%PARAMETERS_DIR%\parameters_aws.py.gpg
2728
if "%cloud_provider%"=="azure" set PARAMS_FILE=%PARAMETERS_DIR%\parameters_azure.py.gpg
2829
if "%cloud_provider%"=="gcp" set PARAMS_FILE=%PARAMETERS_DIR%\parameters_gcp.py.gpg
2930
gpg --quiet --batch --yes --decrypt --passphrase="%PARAMETERS_SECRET%" %PARAMS_FILE% > test\parameters.py
30-
gpg --quiet --batch --yes --decrypt --passphrase="%PYTHON_PRIVATE_KEY_SECRET%" %CONNECTOR_DIR%\.github\workflows\parameters\public\rsa_keys\rsa_key_python_%cloud_provider%.p8.gpg > test\rsa_key_python_%cloud_provider%.p8
31+
gpg --quiet --batch --yes --decrypt --passphrase="%PARAMETERS_SECRET%" %CONNECTOR_DIR%\.github\workflows\parameters\public\rsa_keys\rsa_key_python_%cloud_provider%.p8.gpg > test\rsa_key_python_%cloud_provider%.p8
3132

3233
:: create tox execution virtual env
3334
set venv_dir=%WORKSPACE%\tox_venv

0 commit comments

Comments
 (0)