Skip to content

Commit bd91063

Browse files
author
Alexandre Lissy
committed
fix
1 parent 213c5ca commit bd91063

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

.github/workflows/enterprise.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,14 @@ jobs:
170170
with:
171171
name: enterprise-tests
172172

173+
- name: "unpack firefox build"
174+
id: unpack
175+
run: |
176+
tar xf ./obj-*/dist/firefox-*.tar*
177+
find .
178+
RUNTIME_PATH=$(find . -type f -name "firefox")
179+
echo "runtime_path=$RUNTIME_PATH" >> "$GITHUB_OUTPUT"
180+
173181
- name: "install python"
174182
run: |
175183
python3 -m venv venv_tests
@@ -182,11 +190,11 @@ jobs:
182190
183191
- name: "run tests"
184192
run: |
185-
RUNTIME_VERSION=$(./obj-*/dist/firefox --version | awk '{ print $3 }')
193+
RUNTIME_VERSION=$(${{ steps.unpack.outputs.runtime_path }} --version | awk '{ print $3 }')
186194
sed -e "s/#RUNTIME_VERSION#/${RUNTIME_VERSION}/g" < expectations.json.in > expectations.json
187195
mkdir -p ./profiles/
188196
. venv_tests/bin/activate
189-
python3 test_firefox_start.py expectations.json ./obj-*/dist/firefox $PWD/geckodriver $PWD/profiles/
197+
python3 test_firefox_start.py expectations.json ${{ steps.unpack.outputs.runtime_path }} $PWD/geckodriver $PWD/profiles/
190198
191199
windows-build-vm:
192200
runs-on: ubuntu-24.04
@@ -343,7 +351,7 @@ jobs:
343351
- name: "unpack firefox build"
344352
id: unpack
345353
run: |
346-
tar xf ./obj-*/dist/firefox-*.tar*
354+
unzip ./obj-*/dist/firefox-*.win64.zip
347355
348356
- name: "install python"
349357
run: |
@@ -470,6 +478,8 @@ jobs:
470478
MOUNT_DIR=$(hdiutil attach ./obj-aarch64-apple-darwin/dist/firefox-144.0a1.en-US.mac.dmg | grep "/Volumes" | sed -e "s/.*\/Volumes/\/Volumes/g")
471479
ls -hal ${MOUNT_DIR}/Firefox.app/Contents/MacOS/firefox
472480
echo "mount_dir=${MOUNT_DIR}" >> "$GITHUB_OUTPUT"
481+
RUNTIME_PATH=$(find ${MOUNT_DIR} -type f -name "firefox")
482+
echo "runtime_path=$RUNTIME_PATH" >> "$GITHUB_OUTPUT"
473483
474484
- name: "install python"
475485
run: |
@@ -483,11 +493,11 @@ jobs:
483493
484494
- name: "run tests"
485495
run: |
486-
RUNTIME_VERSION=$(/Volumes/Firefox/Firefox.app/Contents/MacOS/firefox --version | awk '{ print $3 }')
496+
RUNTIME_VERSION=$(${{ steps.attach.outputs.runtime_path }} --version | awk '{ print $3 }')
487497
sed -e "s/#RUNTIME_VERSION#/${RUNTIME_VERSION}/g" < expectations.json.in > expectations.json
488498
mkdir -p ./profiles/
489499
. venv_tests/bin/activate
490-
python3 test_firefox_start.py expectations.json /Volumes/Firefox/Firefox.app/Contents/MacOS/firefox $PWD/geckodriver $PWD/profiles/
500+
python3 test_firefox_start.py expectations.json ${{ steps.attach.outputs.runtime_path }} $PWD/geckodriver $PWD/profiles/
491501
492502
- name: "detach"
493503
if: "always()"

0 commit comments

Comments
 (0)