Skip to content

Commit e7b1b30

Browse files
Revert "NO-SNOW: test env.GITHUB_ENV and bash"
This reverts commit 0897218.
1 parent 0897218 commit e7b1b30

File tree

1 file changed

+17
-28
lines changed

1 file changed

+17
-28
lines changed

.github/workflows/build_test.yml

Lines changed: 17 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
- name: Install tox
4242
run: python -m pip install tox>=4
4343
- name: Set PY
44-
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $env.GITHUB_ENV
44+
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
4545
- uses: actions/cache@v4
4646
with:
4747
path: ~/.cache/pre-commit
@@ -88,7 +88,7 @@ jobs:
8888
runs-on: ${{ matrix.os.image }}
8989
steps:
9090
- name: Set shortver
91-
run: echo "shortver=${longver//./}" >> $env.GITHUB_ENV
91+
run: echo "shortver=${longver//./}" >> $GITHUB_ENV
9292
env:
9393
longver: ${{ matrix.python-version }}
9494
shell: bash
@@ -179,7 +179,7 @@ jobs:
179179
nohup mitmdump --mode regular --listen-port 18453 \
180180
-s ci/github/save_mitm_requests.py \
181181
--set termlog_verbosity=warn &
182-
echo "PROXY_PID=$!" >> $env.GITHUB_ENV
182+
echo "PROXY_PID=$!" >> $GITHUB_ENV
183183
184184
# Wait for proxy to be ready
185185
for i in {1..30}; do
@@ -252,17 +252,14 @@ jobs:
252252
run: |
253253
mkdir -p ~/ca-cert
254254
cp ~/.mitmproxy/mitmproxy-ca-cert.pem ~/ca-cert/
255-
echo "CA cert copied to ~/ca-cert/"
256-
shell: bash
255+
echo "REQUESTS_CA_BUNDLE=$HOME/ca-cert/mitmproxy-ca-cert.pem" >> $GITHUB_ENV
257256
258-
- name: Set and verify proxy variables
257+
- name: Set proxy variables
259258
run: |
260-
# Set proxy variables for subsequent steps
261-
echo "HTTP_PROXY=http://127.0.0.1:18453" >> $env.GITHUB_ENV
262-
echo "HTTPS_PROXY=http://127.0.0.1:18453" >> $env.GITHUB_ENV
263-
echo "http_proxy=http://127.0.0.1:18453" >> $env.GITHUB_ENV
264-
echo "https_proxy=http://127.0.0.1:18453" >> $env.GITHUB_ENV
265-
echo "REQUESTS_CA_BUNDLE=$HOME/ca-cert/mitmproxy-ca-cert.pem" >> $env.GITHUB_ENV
259+
echo "HTTP_PROXY=http://127.0.0.1:18453" >> $GITHUB_ENV
260+
echo "HTTPS_PROXY=http://127.0.0.1:18453" >> $GITHUB_ENV
261+
echo "http_proxy=http://127.0.0.1:18453" >> $GITHUB_ENV
262+
echo "https_proxy=http://127.0.0.1:18453" >> $GITHUB_ENV
266263
267264
# Debug: Verify proxy variables are set
268265
echo "=== Proxy Environment Check ==="
@@ -271,7 +268,6 @@ jobs:
271268
echo "http_proxy=$http_proxy"
272269
echo "https_proxy=$https_proxy"
273270
echo "REQUESTS_CA_BUNDLE=$REQUESTS_CA_BUNDLE"
274-
shell: bash
275271
276272
- name: Run tests
277273
# To run a single test on GHA use the below command:
@@ -328,21 +324,14 @@ jobs:
328324
echo "No proxy PID found in environment"
329325
fi
330326
331-
echo "Proxy stopped"
332-
shell: bash
333-
334-
- name: Clear proxy environment variables
335-
if: always()
336-
run: |
337-
# Clear proxy environment variables for subsequent steps
338-
echo "HTTP_PROXY=" >> $env.GITHUB_ENV
339-
echo "HTTPS_PROXY=" >> $env.GITHUB_ENV
340-
echo "http_proxy=" >> $env.GITHUB_ENV
341-
echo "https_proxy=" >> $env.GITHUB_ENV
342-
echo "REQUESTS_CA_BUNDLE=" >> $env.GITHUB_ENV
343-
echo "Proxy environment variables cleared"
327+
# Unset proxy environment variables
328+
echo "HTTP_PROXY=" >> $GITHUB_ENV
329+
echo "HTTPS_PROXY=" >> $GITHUB_ENV
330+
echo "http_proxy=" >> $GITHUB_ENV
331+
echo "https_proxy=" >> $GITHUB_ENV
332+
echo "REQUESTS_CA_BUNDLE=" >> $GITHUB_ENV
333+
echo "All proxy environment variables cleared"
344334
shell: bash
345-
346335
- name: Combine coverages
347336
run: python -m tox run -e coverage --skip-missing-interpreters false
348337
shell: bash
@@ -489,7 +478,7 @@ jobs:
489478
cloud-provider: [aws]
490479
steps:
491480
- name: Set shortver
492-
run: echo "shortver=${longver//./}" >> $env.GITHUB_ENV
481+
run: echo "shortver=${longver//./}" >> $GITHUB_ENV
493482
env:
494483
longver: ${{ matrix.python-version }}
495484
shell: bash

0 commit comments

Comments
 (0)