From 804d3d56d1612accbf8ca16f47eb7acd411ea6f3 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 09:33:22 +0100 Subject: [PATCH 01/84] Create Github action to test browser build --- .github/workflows/browser.yml | 50 +++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/workflows/browser.yml diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml new file mode 100644 index 000000000000..df43de720d54 --- /dev/null +++ b/.github/workflows/browser.yml @@ -0,0 +1,50 @@ +# Attempt to build the whole browser +name: Browser + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the main branch + push: + branches: [ main ] + pull_request: + branches: [ main ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +jobs: + + # Test applying playwright patches and installing dependencies + patch: + runs-on: ubuntu-latest + + steps: + - name: Install Dependencies + run: | + sudo apt-get update + sudo apt-get install -y \ + curl \ + python3 \ + python3-pip \ + python3-venv \ + tar \ + zip \ + unzip \ + git + python3 -m pip install setuptools + + - name: Checkout release branch + uses: actions/checkout@v3 + + - name: Dry Run + run: | + cp taintfox_mozconfig_ubuntu .mozconfig + bash build.sh -p -n + + - name: Build + run: | + bash build.sh -s -v + + - name: Package + run: | + bash build.sh -s -u From 1edb9a5076189d93be10d7d6f020ff80b6dbec3a Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 09:43:12 +0100 Subject: [PATCH 02/84] Add more browser dependencies --- .github/workflows/browser.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index df43de720d54..cbe2185f4f70 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -31,6 +31,7 @@ jobs: zip \ unzip \ git + sudo apt-get install -y --no-install-recommends ffmpeg libasound2 libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf python3 -m pip install setuptools - name: Checkout release branch From 910d1410ffcd72cb2cef7465a3a6804cda8d54be Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 09:47:49 +0100 Subject: [PATCH 03/84] Switch to jammy --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index cbe2185f4f70..27dfee323855 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -16,7 +16,7 @@ jobs: # Test applying playwright patches and installing dependencies patch: - runs-on: ubuntu-latest + runs-on: ubuntu-jammy steps: - name: Install Dependencies From 4f84c05e51b78ca7fa3db01acbe2d4818d966149 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 09:50:49 +0100 Subject: [PATCH 04/84] Switch to ubuntu-22.04 --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 27dfee323855..a00cf0e9158e 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -16,7 +16,7 @@ jobs: # Test applying playwright patches and installing dependencies patch: - runs-on: ubuntu-jammy + runs-on: ubuntu-22.04 steps: - name: Install Dependencies From 324146ee3e5afca00c0d855593b8eb3772ed2dec Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 09:54:43 +0100 Subject: [PATCH 05/84] Add alsa-lib to dependencies --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index a00cf0e9158e..64310b63b787 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -31,7 +31,7 @@ jobs: zip \ unzip \ git - sudo apt-get install -y --no-install-recommends ffmpeg libasound2 libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf + sudo apt-get install -y --no-install-recommends alsa-lib ffmpeg libasound2 libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf python3 -m pip install setuptools - name: Checkout release branch From 9bf48cc94eb9f98920b04d42dd0525833ea859ee Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 09:57:24 +0100 Subject: [PATCH 06/84] Trying alsa-base --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 64310b63b787..26976ef3340d 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -31,7 +31,7 @@ jobs: zip \ unzip \ git - sudo apt-get install -y --no-install-recommends alsa-lib ffmpeg libasound2 libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf + sudo apt-get install -y --no-install-recommends alsa-base ffmpeg libasound2 libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf python3 -m pip install setuptools - name: Checkout release branch From a7ed5a53ad866af298111618557868383f4f5edf Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 11:31:34 +0100 Subject: [PATCH 07/84] Try with libasound2-dev --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 26976ef3340d..c16b5b641a8e 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -31,7 +31,7 @@ jobs: zip \ unzip \ git - sudo apt-get install -y --no-install-recommends alsa-base ffmpeg libasound2 libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf + sudo apt-get install -y --no-install-recommends ffmpeg libasound2 libasound2-dev libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf python3 -m pip install setuptools - name: Checkout release branch From 6fca6c79f53e7a647d52ecf48b42bb4fdb4b5932 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 11:35:44 +0100 Subject: [PATCH 08/84] use 64 bit libraries for libasound --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index c16b5b641a8e..c816292bf5e0 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -31,7 +31,7 @@ jobs: zip \ unzip \ git - sudo apt-get install -y --no-install-recommends ffmpeg libasound2 libasound2-dev libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf + sudo apt-get install -y --no-install-recommends ffmpeg libasound2t64 libasound2t64-dev libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf python3 -m pip install setuptools - name: Checkout release branch From 3ac38c1e6435413e328d4b590263b63eebaa3a06 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 11:38:23 +0100 Subject: [PATCH 09/84] More alsa library fun --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index c816292bf5e0..64310b63b787 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -31,7 +31,7 @@ jobs: zip \ unzip \ git - sudo apt-get install -y --no-install-recommends ffmpeg libasound2t64 libasound2t64-dev libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf + sudo apt-get install -y --no-install-recommends alsa-lib ffmpeg libasound2 libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf python3 -m pip install setuptools - name: Checkout release branch From c5e40867ac688baff79ade00359a4af7023c35e2 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 11:40:33 +0100 Subject: [PATCH 10/84] Remove alsa-lib again --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 64310b63b787..a00cf0e9158e 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -31,7 +31,7 @@ jobs: zip \ unzip \ git - sudo apt-get install -y --no-install-recommends alsa-lib ffmpeg libasound2 libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf + sudo apt-get install -y --no-install-recommends ffmpeg libasound2 libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf python3 -m pip install setuptools - name: Checkout release branch From d07cdb4397e461e9a18eff1cbe5767e77f2c48e7 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 11:44:21 +0100 Subject: [PATCH 11/84] Add bootstrap step --- .github/workflows/browser.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index a00cf0e9158e..cb5c91977048 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -42,6 +42,10 @@ jobs: cp taintfox_mozconfig_ubuntu .mozconfig bash build.sh -p -n + - name: Bootstrap + run: | + bash bash build.sh -u -v + - name: Build run: | bash build.sh -s -v From aeafc39f2d82568b1f57b848db33d441b72eaadb Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 11:44:43 +0100 Subject: [PATCH 12/84] Removing excess bash --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index cb5c91977048..27c42d9cbacd 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -44,7 +44,7 @@ jobs: - name: Bootstrap run: | - bash bash build.sh -u -v + bash build.sh -u -v - name: Build run: | From 31abbf6fb956dc78d67b90e720d1ee9b01ccd6b0 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:34:02 +0100 Subject: [PATCH 13/84] Add disk space check --- .github/workflows/browser.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 27c42d9cbacd..4b4c64972721 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -39,17 +39,21 @@ jobs: - name: Dry Run run: | + df -h cp taintfox_mozconfig_ubuntu .mozconfig bash build.sh -p -n - name: Bootstrap run: | + df -h bash build.sh -u -v - name: Build run: | + df -h bash build.sh -s -v - name: Package run: | + df -h bash build.sh -s -u From 9a3a52bc88378d5c03f03efe3cc62c86bb1b859c Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:45:26 +0100 Subject: [PATCH 14/84] Add more space checks --- .github/workflows/browser.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 4b4c64972721..17b12687fa7a 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -21,6 +21,7 @@ jobs: steps: - name: Install Dependencies run: | + df -h sudo apt-get update sudo apt-get install -y \ curl \ @@ -33,9 +34,12 @@ jobs: git sudo apt-get install -y --no-install-recommends ffmpeg libasound2 libatk1.0-0 libcairo-gobject2 libcairo2 libdbus-1-3 libdbus-glib-1-2 libfontconfig1 libfreetype6 libgdk-pixbuf-2.0-0 libglib2.0-0 libgtk-3-0 libpango-1.0-0 libpangocairo-1.0-0 libx11-6 libx11-xcb1 libxcb-shm0 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxtst6 xvfb fonts-noto-color-emoji fonts-unifont xfonts-cyrillic xfonts-scalable fonts-liberation fonts-ipafont-gothic fonts-wqy-zenhei fonts-tlwg-loma-otf fonts-freefont-ttf python3 -m pip install setuptools + df -h - name: Checkout release branch - uses: actions/checkout@v3 + uses: actions/checkout@v4 + with: + fetch-depth: 1 - name: Dry Run run: | From 8a24143489519e461afce155461cded78b0e9fb0 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 13:47:02 +0100 Subject: [PATCH 15/84] Change indentation --- .github/workflows/browser.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 17b12687fa7a..a41ca90196bf 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -38,8 +38,8 @@ jobs: - name: Checkout release branch uses: actions/checkout@v4 - with: - fetch-depth: 1 + with: + fetch-depth: 1 - name: Dry Run run: | From 8cf1cd90d86855825858d8eb8768ebbb4ff3b724 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Mon, 27 Jan 2025 14:05:06 +0100 Subject: [PATCH 16/84] Free disk space before build --- .github/workflows/browser.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index a41ca90196bf..5a8433e2c91c 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -19,6 +19,17 @@ jobs: runs-on: ubuntu-22.04 steps: + - name: Free Disk Space (Ubuntu) + uses: jlumbroso/free-disk-space@main + with: + tool-cache: true + android: true + dotnet: true + haskell: true + large-packages: true + docker-images: true + swap-storage: true + - name: Install Dependencies run: | df -h From 1cb2a711b12bc1c426be710321bb1508aa2d053b Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:37:48 +0100 Subject: [PATCH 17/84] Try adding a windows build step --- .github/workflows/browser.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 5a8433e2c91c..004abecd0e8f 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -14,8 +14,8 @@ on: jobs: - # Test applying playwright patches and installing dependencies - patch: + # Test complete build on Ubuntu + ubuntu-build: runs-on: ubuntu-22.04 steps: @@ -72,3 +72,17 @@ jobs: run: | df -h bash build.sh -s -u + + # Test complete build on Windows + windows-build: + runs-on: windows-latest + + steps: + - name: Checkout release branch + uses: actions/checkout@v4 + with: + fetch-depth: 1 + + - name: Download mozbuild + run: | + .\mach bootstrap From 0a0ab08e15945dfd877718a18820456cae091965 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:50:43 +0100 Subject: [PATCH 18/84] Install Mozbuild --- .github/workflows/browser.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 004abecd0e8f..e7c60b9002e9 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -78,11 +78,19 @@ jobs: runs-on: windows-latest steps: + + - name: Download mozbuild + run: | + wget https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe + .\MozillabuildSetup-Latest.exe + - name: Checkout release branch uses: actions/checkout@v4 with: fetch-depth: 1 - - name: Download mozbuild + + + - name: Bootstrap run: | - .\mach bootstrap + .\mach.ps1 bootstrap From 4a04d785d24e07e937393167d77bcdfe9afa16ab Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:58:18 +0100 Subject: [PATCH 19/84] Use invoke-webrequest --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index e7c60b9002e9..964c49428652 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -81,7 +81,7 @@ jobs: - name: Download mozbuild run: | - wget https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe + Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe .\MozillabuildSetup-Latest.exe - name: Checkout release branch From a31d69fbdf81fc5bc8e2d74c07409fbeebd55f7c Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Tue, 28 Jan 2025 12:59:48 +0100 Subject: [PATCH 20/84] Fix typo --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 964c49428652..58afbac5926a 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -82,7 +82,7 @@ jobs: - name: Download mozbuild run: | Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe - .\MozillabuildSetup-Latest.exe + .\MozillaBuildSetup-Latest.exe - name: Checkout release branch uses: actions/checkout@v4 From a0a9776734d55d3003a1b4ca09bd3deb3dac5ef9 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:06:17 +0100 Subject: [PATCH 21/84] Download MozBuild to file --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 58afbac5926a..db9ec807af80 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -81,7 +81,7 @@ jobs: - name: Download mozbuild run: | - Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe + Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe .\MozillaBuildSetup-Latest.exe - name: Checkout release branch From 66a72f753fa11c031d5e81f76af05d275d3f83fc Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:22:48 +0100 Subject: [PATCH 22/84] Extract mozilla build by hand --- .github/workflows/browser.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index db9ec807af80..0c55623df7fc 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -81,8 +81,10 @@ jobs: - name: Download mozbuild run: | + mkdir -p C:\mozilla-build + cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe - .\MozillaBuildSetup-Latest.exe + C:\Program Files\7-Zip\7z.exe e .\MozillaBuildSetup-Latest.exe - name: Checkout release branch uses: actions/checkout@v4 From 4a9c8126367197949eeea9192431a3007afe099a Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:26:01 +0100 Subject: [PATCH 23/84] Adding quotes around command --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 0c55623df7fc..cd8ed5ce28c6 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -84,7 +84,7 @@ jobs: mkdir -p C:\mozilla-build cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe - C:\Program Files\7-Zip\7z.exe e .\MozillaBuildSetup-Latest.exe + 'C:\Program Files\7-Zip\7z.exe' e .\MozillaBuildSetup-Latest.exe - name: Checkout release branch uses: actions/checkout@v4 From f4e081f44b751dbf3541bfe8e67d19f51b1ca069 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:30:02 +0100 Subject: [PATCH 24/84] Add magic call operator --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index cd8ed5ce28c6..8199cb4d9bdb 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -84,7 +84,7 @@ jobs: mkdir -p C:\mozilla-build cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe - 'C:\Program Files\7-Zip\7z.exe' e .\MozillaBuildSetup-Latest.exe + &'C:\Program Files\7-Zip\7z.exe' e .\MozillaBuildSetup-Latest.exe - name: Checkout release branch uses: actions/checkout@v4 From de17b778513be07fc0c0db962279e93b42b941c9 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:33:59 +0100 Subject: [PATCH 25/84] Add 7zip switches --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 8199cb4d9bdb..1601c133953b 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -84,7 +84,7 @@ jobs: mkdir -p C:\mozilla-build cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe - &'C:\Program Files\7-Zip\7z.exe' e .\MozillaBuildSetup-Latest.exe + &'C:\Program Files\7-Zip\7z.exe' e -r -y .\MozillaBuildSetup-Latest.exe - name: Checkout release branch uses: actions/checkout@v4 From 006474dc0d7aa1eaa7d0fdf2e4dfd5e4857fbb38 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Tue, 28 Jan 2025 13:42:58 +0100 Subject: [PATCH 26/84] Add build stage --- .github/workflows/browser.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 1601c133953b..764328807295 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -95,4 +95,13 @@ jobs: - name: Bootstrap run: | - .\mach.ps1 bootstrap + .\mach.ps1 --no-interactive bootstrap --application-choice=browser + + - name: Build + run: | + cp "taintfox_mozconfig_ubuntu" ".mozconfig" + .\mach.ps1 build + + - name: Package + run: | + .\mach.ps1 package From 89d54f19fbe7fbe334ea56ec07ce1753396a79dd Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:04:29 +0100 Subject: [PATCH 27/84] Try piping commands to mozilla build shell --- .github/workflows/browser.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 764328807295..73a14e8ea7d4 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -81,6 +81,7 @@ jobs: - name: Download mozbuild run: | + pwd mkdir -p C:\mozilla-build cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe @@ -91,17 +92,15 @@ jobs: with: fetch-depth: 1 - - - name: Bootstrap run: | - .\mach.ps1 --no-interactive bootstrap --application-choice=browser - + echo "cd /d/project-foxhound/ && ./mach --no-interactive bootstrap --application-choice=browser" | C:\mozilla-build\start-shell.bat + - name: Build run: | cp "taintfox_mozconfig_ubuntu" ".mozconfig" - .\mach.ps1 build + echo "cd /d/project-foxhound/ && ./mach build" | C:\mozilla-build\start-shell.bat - name: Package run: | - .\mach.ps1 package + echo "cd /d/project-foxhound/ && ./mach package" | C:\mozilla-build\start-shell.bat From 715e27cf7b74e2cc77a1b256f0d9361590427f27 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:11:48 +0100 Subject: [PATCH 28/84] Add test commands for mozilla build --- .github/workflows/browser.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 73a14e8ea7d4..3027e3c852f5 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -86,6 +86,7 @@ jobs: cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe &'C:\Program Files\7-Zip\7z.exe' e -r -y .\MozillaBuildSetup-Latest.exe + echo "ls /" | C:\mozilla-build\start-shell.bat - name: Checkout release branch uses: actions/checkout@v4 @@ -94,13 +95,13 @@ jobs: - name: Bootstrap run: | - echo "cd /d/project-foxhound/ && ./mach --no-interactive bootstrap --application-choice=browser" | C:\mozilla-build\start-shell.bat + echo "ls / && cd /d/a/project-foxhound/ && ./mach --no-interactive bootstrap --application-choice=browser" | C:\mozilla-build\start-shell.bat - name: Build run: | cp "taintfox_mozconfig_ubuntu" ".mozconfig" - echo "cd /d/project-foxhound/ && ./mach build" | C:\mozilla-build\start-shell.bat + echo "cd /d/a/project-foxhound/ && ./mach build" | C:\mozilla-build\start-shell.bat - name: Package run: | - echo "cd /d/project-foxhound/ && ./mach package" | C:\mozilla-build\start-shell.bat + echo "cd /d/a/project-foxhound/ && ./mach package" | C:\mozilla-build\start-shell.bat From 08b9b3e83b884ca9f2d20580f11f2681e78f10c5 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:17:17 +0100 Subject: [PATCH 29/84] Changing msys command line options --- .github/workflows/browser.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 3027e3c852f5..4d8cbc01d430 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -86,7 +86,7 @@ jobs: cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe &'C:\Program Files\7-Zip\7z.exe' e -r -y .\MozillaBuildSetup-Latest.exe - echo "ls /" | C:\mozilla-build\start-shell.bat + echo "ls" | C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound - name: Checkout release branch uses: actions/checkout@v4 @@ -95,13 +95,13 @@ jobs: - name: Bootstrap run: | - echo "ls / && cd /d/a/project-foxhound/ && ./mach --no-interactive bootstrap --application-choice=browser" | C:\mozilla-build\start-shell.bat + echo "./mach --no-interactive bootstrap --application-choice=browser" | C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound - name: Build run: | cp "taintfox_mozconfig_ubuntu" ".mozconfig" - echo "cd /d/a/project-foxhound/ && ./mach build" | C:\mozilla-build\start-shell.bat + echo "./mach build" | C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound - name: Package run: | - echo "cd /d/a/project-foxhound/ && ./mach package" | C:\mozilla-build\start-shell.bat + echo "./mach package" | C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound From cba573b2c496914b86db17ce79b03ea98e635116 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:21:54 +0100 Subject: [PATCH 30/84] Update browser.yml --- .github/workflows/browser.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 4d8cbc01d430..074e4283becc 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -85,8 +85,9 @@ jobs: mkdir -p C:\mozilla-build cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe - &'C:\Program Files\7-Zip\7z.exe' e -r -y .\MozillaBuildSetup-Latest.exe - echo "ls" | C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound + &'C:\Program Files\7-Zip\7z.exe' e -r -y .\MozillaBuildSetup-Latest.exe + ls + echo "ls" | "C:\mozilla-build\start-shell.bat" - name: Checkout release branch uses: actions/checkout@v4 From 8259b30deadb01014e7538c38112e3fd063eabab Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:24:46 +0100 Subject: [PATCH 31/84] Try with quotes --- .github/workflows/browser.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 074e4283becc..77d0c5bbc5e0 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -87,7 +87,7 @@ jobs: Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe &'C:\Program Files\7-Zip\7z.exe' e -r -y .\MozillaBuildSetup-Latest.exe ls - echo "ls" | "C:\mozilla-build\start-shell.bat" + echo "ls" | C:\mozilla-build\start-shell.bat - name: Checkout release branch uses: actions/checkout@v4 @@ -96,13 +96,13 @@ jobs: - name: Bootstrap run: | - echo "./mach --no-interactive bootstrap --application-choice=browser" | C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound + echo "./mach --no-interactive bootstrap --application-choice=browser" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" - name: Build run: | cp "taintfox_mozconfig_ubuntu" ".mozconfig" - echo "./mach build" | C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound + echo "./mach build" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" - name: Package run: | - echo "./mach package" | C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound + echo "./mach package" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" From 2939fb2833f18b8eb3fd05d016f6d540c9d7f714 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:27:18 +0100 Subject: [PATCH 32/84] Test mozilla build help --- .github/workflows/browser.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 77d0c5bbc5e0..b907100501d4 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -86,8 +86,7 @@ jobs: cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe &'C:\Program Files\7-Zip\7z.exe' e -r -y .\MozillaBuildSetup-Latest.exe - ls - echo "ls" | C:\mozilla-build\start-shell.bat + C:\mozilla-build\start-shell.bat --help - name: Checkout release branch uses: actions/checkout@v4 From b76f5737b709f0da73dafaebc205dabcb72fb10c Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:30:30 +0100 Subject: [PATCH 33/84] More fun with quotes --- .github/workflows/browser.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index b907100501d4..1c509cec53d6 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -81,12 +81,12 @@ jobs: - name: Download mozbuild run: | - pwd mkdir -p C:\mozilla-build cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe &'C:\Program Files\7-Zip\7z.exe' e -r -y .\MozillaBuildSetup-Latest.exe - C:\mozilla-build\start-shell.bat --help + pwd + &'C:\mozilla-build\start-shell.bat' --help - name: Checkout release branch uses: actions/checkout@v4 From 0a0fd175dcec7d7112acae84312a7e004d36c8a6 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:34:32 +0100 Subject: [PATCH 34/84] Main debug info --- .github/workflows/browser.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 1c509cec53d6..27382a57cfe2 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -81,12 +81,13 @@ jobs: - name: Download mozbuild run: | + Set-PSDebug -Trace 1 mkdir -p C:\mozilla-build cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe &'C:\Program Files\7-Zip\7z.exe' e -r -y .\MozillaBuildSetup-Latest.exe pwd - &'C:\mozilla-build\start-shell.bat' --help + cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help - name: Checkout release branch uses: actions/checkout@v4 From 1f8241a9933317f543908026fbbcbdf9d9d09ee7 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:39:36 +0100 Subject: [PATCH 35/84] Change z-zip extraction parameters --- .github/workflows/browser.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 27382a57cfe2..8890b059ae7d 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -85,8 +85,9 @@ jobs: mkdir -p C:\mozilla-build cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe - &'C:\Program Files\7-Zip\7z.exe' e -r -y .\MozillaBuildSetup-Latest.exe + &'C:\Program Files\7-Zip\7z.exe' x -r -y .\MozillaBuildSetup-Latest.exe pwd + ls cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help - name: Checkout release branch From 5f9da1f009d04bc3414244e89940341b419524d8 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:44:01 +0100 Subject: [PATCH 36/84] Switch back to ps1 commands now that mozilla-build is extracted properly --- .github/workflows/browser.yml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 8890b059ae7d..51b648162abb 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -94,16 +94,14 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 1 - + - name: Bootstrap run: | - echo "./mach --no-interactive bootstrap --application-choice=browser" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" - + .\mach.ps1 --no-interactive bootstrap --application-choice=browser - name: Build run: | cp "taintfox_mozconfig_ubuntu" ".mozconfig" - echo "./mach build" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" - + .\mach.ps1 build - name: Package run: | - echo "./mach package" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" + .\mach.ps1 package From 22144e89039a128de06c43d2442934809a035cca Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 16:56:14 +0100 Subject: [PATCH 37/84] Looks like we still need the mozilla build shell --- .github/workflows/browser.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 51b648162abb..ded27c2f6683 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -97,11 +97,12 @@ jobs: - name: Bootstrap run: | - .\mach.ps1 --no-interactive bootstrap --application-choice=browser + echo "./mach --no-interactive bootstrap --application-choice=browser" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" + - name: Build run: | cp "taintfox_mozconfig_ubuntu" ".mozconfig" - .\mach.ps1 build + echo "./mach build" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" - name: Package run: | - .\mach.ps1 package + echo "./mach package" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" From f5d4d4b73e6f94a78f856f377d2f863fbee5d187 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 17:10:25 +0100 Subject: [PATCH 38/84] Pass shell commands to start-shell directly --- .github/workflows/browser.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index ded27c2f6683..56357f737916 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -97,12 +97,13 @@ jobs: - name: Bootstrap run: | - echo "./mach --no-interactive bootstrap --application-choice=browser" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" + cp "taintfox_mozconfig_ubuntu" ".mozconfig" + C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" -c "./mach --no-interactive bootstrap --application-choice=browser" - name: Build run: | - cp "taintfox_mozconfig_ubuntu" ".mozconfig" - echo "./mach build" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" + C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" -c "./mach build" + - name: Package run: | - echo "./mach package" | C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" + C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" -c "./mach package" From 784914854a26d3b2f2ad79e5fa4b14dae5bf01ae Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 17:25:37 +0100 Subject: [PATCH 39/84] Trying using a custom shell --- .github/workflows/browser.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 56357f737916..ba3fe16ae228 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -89,7 +89,12 @@ jobs: pwd ls cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help - + + - name: Test Mozbuild + shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} + run: | + ls + - name: Checkout release branch uses: actions/checkout@v4 with: From e17dfcc8075685c8785ecd739c8475912064c3f8 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 17:29:56 +0100 Subject: [PATCH 40/84] Use mozilla build shell everywhere --- .github/workflows/browser.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index ba3fe16ae228..417211f2f3d8 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -93,7 +93,7 @@ jobs: - name: Test Mozbuild shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} run: | - ls + ls /c/mozilla-build - name: Checkout release branch uses: actions/checkout@v4 @@ -101,14 +101,17 @@ jobs: fetch-depth: 1 - name: Bootstrap + shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} run: | cp "taintfox_mozconfig_ubuntu" ".mozconfig" - C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" -c "./mach --no-interactive bootstrap --application-choice=browser" + ./mach --no-interactive bootstrap --application-choice=browser - name: Build + shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} run: | - C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" -c "./mach build" + ./mach build - name: Package + shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} run: | - C:\mozilla-build\start-shell.bat -where "D:\a\project-foxhound\project-foxhound" -c "./mach package" + ./mach package From e3f19c63f36825bd61b30047e6e5fd1bafb14b31 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 17:38:27 +0100 Subject: [PATCH 41/84] Try modifying shell command --- .github/workflows/browser.yml | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 417211f2f3d8..83df364a0019 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -91,27 +91,27 @@ jobs: cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help - name: Test Mozbuild - shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} + shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c "{0}" run: | ls /c/mozilla-build - - name: Checkout release branch - uses: actions/checkout@v4 - with: - fetch-depth: 1 + # - name: Checkout release branch + # uses: actions/checkout@v4 + # with: + # fetch-depth: 1 - - name: Bootstrap - shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} - run: | - cp "taintfox_mozconfig_ubuntu" ".mozconfig" - ./mach --no-interactive bootstrap --application-choice=browser + # - name: Bootstrap + # shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} + # run: | + # cp "taintfox_mozconfig_ubuntu" ".mozconfig" + # ./mach --no-interactive bootstrap --application-choice=browser - - name: Build - shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} - run: | - ./mach build + # - name: Build + # shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} + # run: | + # ./mach build - - name: Package - shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} - run: | - ./mach package + # - name: Package + # shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} + # run: | + # ./mach package From ffd3056435a39044eb866a7edb333694abd395a2 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 17:43:23 +0100 Subject: [PATCH 42/84] Try with a cmd in the shell --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 83df364a0019..4f7b5d8aa490 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -91,7 +91,7 @@ jobs: cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help - name: Test Mozbuild - shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c "{0}" + shell: cmd /c C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c '{0}' run: | ls /c/mozilla-build From 8ca1aefe900450ef3f69b314d59004a71ef82028 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 17:47:34 +0100 Subject: [PATCH 43/84] Try our luck with bash for windows --- .github/workflows/browser.yml | 36 +++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 4f7b5d8aa490..3e256db95509 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -91,27 +91,27 @@ jobs: cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help - name: Test Mozbuild - shell: cmd /c C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c '{0}' + shell: bash run: | ls /c/mozilla-build - # - name: Checkout release branch - # uses: actions/checkout@v4 - # with: - # fetch-depth: 1 + - name: Checkout release branch + uses: actions/checkout@v4 + with: + fetch-depth: 1 - # - name: Bootstrap - # shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} - # run: | - # cp "taintfox_mozconfig_ubuntu" ".mozconfig" - # ./mach --no-interactive bootstrap --application-choice=browser + - name: Bootstrap + shell: bash + run: | + cp "taintfox_mozconfig_ubuntu" ".mozconfig" + ./mach --no-interactive bootstrap --application-choice=browser - # - name: Build - # shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} - # run: | - # ./mach build + - name: Build + shell: bash + run: | + ./mach build - # - name: Package - # shell: C:\mozilla-build\start-shell.bat -where D:\a\project-foxhound\project-foxhound -c {0} - # run: | - # ./mach package + - name: Package + shell: bash + run: | + ./mach package From ad1518547192e6cc4d870ceb548e4f2d68c814f7 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 17:56:29 +0100 Subject: [PATCH 44/84] Try with msys2 shell directly --- .github/workflows/browser.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 3e256db95509..719bb1fb5eb2 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -90,8 +90,11 @@ jobs: ls cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help + - name: Setup Msys2 + - uses: msys2/setup-msys2@v2 + - name: Test Mozbuild - shell: bash + shell: msys2 {0} run: | ls /c/mozilla-build @@ -101,17 +104,17 @@ jobs: fetch-depth: 1 - name: Bootstrap - shell: bash + shell: msys2 {0} run: | cp "taintfox_mozconfig_ubuntu" ".mozconfig" ./mach --no-interactive bootstrap --application-choice=browser - name: Build - shell: bash + shell: msys2 {0} run: | ./mach build - name: Package - shell: bash + shell: msys2 {0} run: | ./mach package From d85b20dcc9fd2affb968ef154da9c2a0aac9c7be Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 17:58:12 +0100 Subject: [PATCH 45/84] Fixing typo --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 719bb1fb5eb2..61e0634a580e 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -91,7 +91,7 @@ jobs: cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help - name: Setup Msys2 - - uses: msys2/setup-msys2@v2 + uses: msys2/setup-msys2@v2 - name: Test Mozbuild shell: msys2 {0} From 2d8e1aa58be7fd6bae80923434633b4f154c9ae6 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 18:07:25 +0100 Subject: [PATCH 46/84] Add python3 to path --- .github/workflows/browser.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 61e0634a580e..8d8537ebf8ea 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -106,6 +106,7 @@ jobs: - name: Bootstrap shell: msys2 {0} run: | + export PATH=${PATH}:/c/mozilla-build/python3 cp "taintfox_mozconfig_ubuntu" ".mozconfig" ./mach --no-interactive bootstrap --application-choice=browser From 4a48968f6cd5e144a0868c93c1e5b03074f971fc Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 18:50:57 +0100 Subject: [PATCH 47/84] Create tmp directory --- .github/workflows/browser.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 8d8537ebf8ea..cb528b4c871e 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -107,15 +107,18 @@ jobs: shell: msys2 {0} run: | export PATH=${PATH}:/c/mozilla-build/python3 + mkdir /tmp cp "taintfox_mozconfig_ubuntu" ".mozconfig" ./mach --no-interactive bootstrap --application-choice=browser - name: Build shell: msys2 {0} run: | + export PATH=${PATH}:/c/mozilla-build/python3 ./mach build - name: Package shell: msys2 {0} run: | + export PATH=${PATH}:/c/mozilla-build/python3 ./mach package From 144c5ae266ef76820362423ec8836fea6d3b64b1 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 18:56:18 +0100 Subject: [PATCH 48/84] Create with -p flag --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index cb528b4c871e..675bc97ec899 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -107,7 +107,7 @@ jobs: shell: msys2 {0} run: | export PATH=${PATH}:/c/mozilla-build/python3 - mkdir /tmp + mkdir -p /tmp cp "taintfox_mozconfig_ubuntu" ".mozconfig" ./mach --no-interactive bootstrap --application-choice=browser From 5f05231a211ac6998958f895e3c20c81d13d1673 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 19:03:56 +0100 Subject: [PATCH 49/84] Update taintfox_mozconfig_win --- taintfox_mozconfig_win | 61 +++++++++++++++++++++++++----------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/taintfox_mozconfig_win b/taintfox_mozconfig_win index c45d658b0b0b..2f69b9bd92dd 100644 --- a/taintfox_mozconfig_win +++ b/taintfox_mozconfig_win @@ -1,40 +1,53 @@ -mk_add_options MOZ_MAKE_FLAGS="-s" +# limit number of parallel jobs - do not do this by default, but might be needed for build systems with limited resources +# mk_add_options MOZ_PARALLEL_BUILD=4 -# Export path to Windows C runtime libraries. -# This will cause those DLLs to be packaged with the application, which is required to run taintfox on non-developer machines +# Use ccache, make sure the path is correct +#ac_add_options --with-ccache=/usr/bin/ccache -# Add-on signing is not required for DevEdition -MOZ_REQUIRE_SIGNING= - -# Force Visual Studio compiler (default is clang) -#export CC=cl -#export LINKER=link - -# Set 32-bit build -#ac_add_options --target=i686-pc-mingw32 -#ac_add_options --host=x86_64-pc-mingw32 -#WIN32_REDIST_DIR="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Redist\MSVC\14.20.27508\x86\Microsoft.VC141.CRT" - - -# Set 64-bit build -ac_add_options --target=x86_64-pc-mingw32 -ac_add_options --host=x86_64-pc-mingw32 -WIN32_REDIST_DIR="C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Redist\MSVC\14.20.27508\x64\Microsoft.VC141.CRT" +# On OS X we only support newer releases so that clang uses libc++ (llvm) instead of stdlibc++ +# We could work around this (typedef basic_string u16string), but this should be fine. +#ac_add_options --enable-macos-target=10.10 # disable updater ac_add_options --disable-updater +# Add-on signing is not required for DevEdition +MOZ_REQUIRE_SIGNING= + +ac_add_options --with-branding=browser/branding/foxhound + # # DEBUG BUILD # -#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-ff-dbg +#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tf-dbg +#ac_add_options --enable-debug-symbols #ac_add_options --enable-debug #ac_add_options --disable-optimize +#ac_add_options --disable-tests +#ac_add_options --enable-project=js +#ac_add_options --enable-jitspew +# Package js shell. +export MOZ_PACKAGE_JSSHELL=1 # # RELEASE BUILD # -mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tf-release-64 -ac_add_options --disable-tests -ac_add_options --enable-cdp +ac_add_options --with-app-name=foxhound +mk_add_options MOZ_APP_NAME=foxhound +#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tf-release +#ac_add_options --disable-tests +ac_add_options --disable-sandbox +ac_add_options --without-wasm-sandboxed-libraries +ac_add_options --disable-crashreporter +ac_add_options --disable-backgroundtasks +ac_add_options --enable-release + +# +# OPTIMIZED BUILD WITH DEBUG SYMBOLS +# +#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tf-release-with-symbols +#ac_add_options --enable-debug-symbols +#ac_add_options --enable-gczeal +#ac_add_options --enable-optimize +#ac_add_options --disable-tests From fa40dff9fe3cc1590f7244dc4ba389605d595586 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 19:11:29 +0100 Subject: [PATCH 50/84] Use windows config --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 675bc97ec899..94eabb960634 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -108,7 +108,7 @@ jobs: run: | export PATH=${PATH}:/c/mozilla-build/python3 mkdir -p /tmp - cp "taintfox_mozconfig_ubuntu" ".mozconfig" + cp "taintfox_mozconfig_windows" ".mozconfig" ./mach --no-interactive bootstrap --application-choice=browser - name: Build From 907b7217a0d1f732cdf367f5186e691be2bc05ab Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 19:11:53 +0100 Subject: [PATCH 51/84] Correcting typo --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 94eabb960634..8808215d47e1 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -108,7 +108,7 @@ jobs: run: | export PATH=${PATH}:/c/mozilla-build/python3 mkdir -p /tmp - cp "taintfox_mozconfig_windows" ".mozconfig" + cp "taintfox_mozconfig_win" ".mozconfig" ./mach --no-interactive bootstrap --application-choice=browser - name: Build From 77097f447812a44059cffe284146cb3724395ff4 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 19:18:11 +0100 Subject: [PATCH 52/84] Move back to powershell mach --- .github/workflows/browser.yml | 39 ++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 8808215d47e1..871d209d734a 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -102,23 +102,34 @@ jobs: uses: actions/checkout@v4 with: fetch-depth: 1 - + - name: Bootstrap - shell: msys2 {0} run: | - export PATH=${PATH}:/c/mozilla-build/python3 - mkdir -p /tmp - cp "taintfox_mozconfig_win" ".mozconfig" - ./mach --no-interactive bootstrap --application-choice=browser - + .\mach.ps1 --no-interactive bootstrap --application-choice=browser - name: Build - shell: msys2 {0} run: | - export PATH=${PATH}:/c/mozilla-build/python3 - ./mach build - + cp "taintfox_mozconfig_win" ".mozconfig" + .\mach.ps1 build - name: Package - shell: msys2 {0} run: | - export PATH=${PATH}:/c/mozilla-build/python3 - ./mach package + .\mach.ps1 package + +# - name: Bootstrap +# shell: msys2 {0} +# run: | +# export PATH=${PATH}:/c/mozilla-build/python3 +# mkdir -p /tmp +# cp "taintfox_mozconfig_win" ".mozconfig" +# ./mach --no-interactive bootstrap --application-choice=browser + +# - name: Build +# shell: msys2 {0} +# run: | +# export PATH=${PATH}:/c/mozilla-build/python3 +# ./mach build + +# - name: Package +# shell: msys2 {0} +# run: | +# export PATH=${PATH}:/c/mozilla-build/python3 +# ./mach package From 269cc984219057b136ea20be5dfe97a106dd7a85 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 19:23:32 +0100 Subject: [PATCH 53/84] Move up mozconfig copy --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 871d209d734a..e0cc9b596ee1 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -105,10 +105,10 @@ jobs: - name: Bootstrap run: | + cp "taintfox_mozconfig_win" ".mozconfig" .\mach.ps1 --no-interactive bootstrap --application-choice=browser - name: Build run: | - cp "taintfox_mozconfig_win" ".mozconfig" .\mach.ps1 build - name: Package run: | From 72e29b41d380ae0f326acb199ef92a1ecdc9e390 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 29 Jan 2025 19:32:58 +0100 Subject: [PATCH 54/84] Try without a config file --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index e0cc9b596ee1..a14b0162f472 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -105,7 +105,7 @@ jobs: - name: Bootstrap run: | - cp "taintfox_mozconfig_win" ".mozconfig" + #cp "taintfox_mozconfig_win" ".mozconfig" .\mach.ps1 --no-interactive bootstrap --application-choice=browser - name: Build run: | From 369203ab2b690b79fb01a8f54e5e05f3ac743d16 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Thu, 30 Jan 2025 09:17:20 +0100 Subject: [PATCH 55/84] Doing some checks on bash shell --- .github/workflows/browser.yml | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index a14b0162f472..4657fe48f92d 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -97,22 +97,25 @@ jobs: shell: msys2 {0} run: | ls /c/mozilla-build + which bash + echo "ls -l /" | bash + echo "ls -l /tmp" | bash - - name: Checkout release branch - uses: actions/checkout@v4 - with: - fetch-depth: 1 +# - name: Checkout release branch +# uses: actions/checkout@v4 +# with: +# fetch-depth: 1 - - name: Bootstrap - run: | - #cp "taintfox_mozconfig_win" ".mozconfig" - .\mach.ps1 --no-interactive bootstrap --application-choice=browser - - name: Build - run: | - .\mach.ps1 build - - name: Package - run: | - .\mach.ps1 package +# - name: Bootstrap +# run: | +# cp "taintfox_mozconfig_win" ".mozconfig" +# .\mach.ps1 --no-interactive bootstrap --application-choice=browser +# - name: Build +# run: | +# .\mach.ps1 build +# - name: Package +# run: | +# .\mach.ps1 package # - name: Bootstrap # shell: msys2 {0} From cc96358f7e6d92d38c44ad8724c2b5c36be766be Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Thu, 30 Jan 2025 09:24:59 +0100 Subject: [PATCH 56/84] Test bash shell --- .github/workflows/browser.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 4657fe48f92d..c3aa3bb99113 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -93,6 +93,15 @@ jobs: - name: Setup Msys2 uses: msys2/setup-msys2@v2 + - name: Test Bash + shell: bash + run: | + ls /c/mozilla-build + ls -l / + which bash + echo "ls -l /" | bash + echo "ls -l /tmp" | bash + - name: Test Mozbuild shell: msys2 {0} run: | From f30b26e5d4a31ec5d0939c33f371183b4706b545 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Thu, 30 Jan 2025 09:38:02 +0100 Subject: [PATCH 57/84] Powershell bash --- .github/workflows/browser.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index c3aa3bb99113..b1ba7117bf2f 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -89,6 +89,8 @@ jobs: pwd ls cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help + executable-find "bash.exe" + echo "ls -l /" | bash.exe - name: Setup Msys2 uses: msys2/setup-msys2@v2 From cffaa9e944dc36749d703dbbd0edf5868739fc3a Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Thu, 30 Jan 2025 12:47:22 +0100 Subject: [PATCH 58/84] Another bash at finding bash --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index b1ba7117bf2f..41e5f0058b1d 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -89,7 +89,7 @@ jobs: pwd ls cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help - executable-find "bash.exe" + where bash echo "ls -l /" | bash.exe - name: Setup Msys2 From 4f50314bb2c07cadba15e74a0ab506aeade94203 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 5 Feb 2025 09:26:06 +0100 Subject: [PATCH 59/84] Update browser.yml --- .github/workflows/browser.yml | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 41e5f0058b1d..cfba5e64a8f4 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -112,10 +112,10 @@ jobs: echo "ls -l /" | bash echo "ls -l /tmp" | bash -# - name: Checkout release branch -# uses: actions/checkout@v4 -# with: -# fetch-depth: 1 + - name: Checkout release branch + uses: actions/checkout@v4 + with: + fetch-depth: 1 # - name: Bootstrap # run: | @@ -128,13 +128,14 @@ jobs: # run: | # .\mach.ps1 package -# - name: Bootstrap -# shell: msys2 {0} -# run: | -# export PATH=${PATH}:/c/mozilla-build/python3 -# mkdir -p /tmp -# cp "taintfox_mozconfig_win" ".mozconfig" -# ./mach --no-interactive bootstrap --application-choice=browser + - name: Bootstrap + shell: msys2 {0} + run: | + export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} + export BASH=/usr/bin/bash + mkdir -p /tmp + cp "taintfox_mozconfig_win" ".mozconfig" + ./mach --no-interactive bootstrap --application-choice=browser # - name: Build # shell: msys2 {0} From e52a60e9a52555a90db6d0eca87c61b7103598a8 Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 10:44:28 +0100 Subject: [PATCH 60/84] Adding some debug statements --- build/autoconf/autoconf.sh | 1 + python/mozbuild/mozbuild/mozconfig.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh index ceb8a25b00af..ab7860b1d15e 100644 --- a/build/autoconf/autoconf.sh +++ b/build/autoconf/autoconf.sh @@ -20,6 +20,7 @@ # If given no args, create `configure' from template file `configure.in'. # With one arg, create a configure script on standard output from # the given template file. +echo "FOXHOUND DEBUG: $0" usage="\ Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir] diff --git a/python/mozbuild/mozbuild/mozconfig.py b/python/mozbuild/mozbuild/mozconfig.py index 4322acbeed25..07f70dce753b 100644 --- a/python/mozbuild/mozbuild/mozconfig.py +++ b/python/mozbuild/mozbuild/mozconfig.py @@ -159,6 +159,8 @@ def read_mozconfig(self, path=None): mozpath.join(mozpath.dirname(self._loader_script), "action", "dump_env.py"), ] + print("FOXHOUND DEBUG:", command) + try: # We need to capture stderr because that's where the shell sends # errors if execution fails. From 33084a1d29097f54ddf22cdf29f67644209ec5e6 Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 11:03:08 +0100 Subject: [PATCH 61/84] Adding more debug messages --- .github/workflows/browser.yml | 3 +++ taintfox_mozconfig_win | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index cfba5e64a8f4..7d1567c6729f 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -111,6 +111,9 @@ jobs: which bash echo "ls -l /" | bash echo "ls -l /tmp" | bash + sh --help + bash --help + - name: Checkout release branch uses: actions/checkout@v4 diff --git a/taintfox_mozconfig_win b/taintfox_mozconfig_win index 2f69b9bd92dd..08603ae39eba 100644 --- a/taintfox_mozconfig_win +++ b/taintfox_mozconfig_win @@ -1,3 +1,6 @@ +echo FOXHOUND_DEBUG +/c/mozilla-build/msys2/usr/bin/sh.exe --help + # limit number of parallel jobs - do not do this by default, but might be needed for build systems with limited resources # mk_add_options MOZ_PARALLEL_BUILD=4 @@ -36,7 +39,7 @@ export MOZ_PACKAGE_JSSHELL=1 ac_add_options --with-app-name=foxhound mk_add_options MOZ_APP_NAME=foxhound #mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tf-release -#ac_add_options --disable-tests +ac_add_options --disable-tests ac_add_options --disable-sandbox ac_add_options --without-wasm-sandboxed-libraries ac_add_options --disable-crashreporter From 135a0462322539164770f3afeafe3256d8382a9e Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 11:05:27 +0100 Subject: [PATCH 62/84] Fixing whitespace issue --- .github/workflows/browser.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 7d1567c6729f..4f0a880ec65b 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -111,9 +111,8 @@ jobs: which bash echo "ls -l /" | bash echo "ls -l /tmp" | bash - sh --help - bash --help - + sh --help + bash --help - name: Checkout release branch uses: actions/checkout@v4 From 78f706b633d0ae57658197abdedcc70c4fd9783b Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 11:17:47 +0100 Subject: [PATCH 63/84] More config debug information --- taintfox_mozconfig_win | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/taintfox_mozconfig_win b/taintfox_mozconfig_win index 08603ae39eba..668af6b1129f 100644 --- a/taintfox_mozconfig_win +++ b/taintfox_mozconfig_win @@ -1,5 +1,9 @@ echo FOXHOUND_DEBUG -/c/mozilla-build/msys2/usr/bin/sh.exe --help +ls / +which sh +which bash +sh --help +bash --help # limit number of parallel jobs - do not do this by default, but might be needed for build systems with limited resources # mk_add_options MOZ_PARALLEL_BUILD=4 From a4026eaedc2c97224409ad9f5e805a5057b976ad Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 11:35:16 +0100 Subject: [PATCH 64/84] Changing msys configuration --- .github/workflows/browser.yml | 3 +++ taintfox_mozconfig_win | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 4f0a880ec65b..bec53ca06226 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -94,6 +94,9 @@ jobs: - name: Setup Msys2 uses: msys2/setup-msys2@v2 + with: + release: false + msystem: MSYS - name: Test Bash shell: bash diff --git a/taintfox_mozconfig_win b/taintfox_mozconfig_win index 668af6b1129f..30f9c170fa58 100644 --- a/taintfox_mozconfig_win +++ b/taintfox_mozconfig_win @@ -1,4 +1,8 @@ echo FOXHOUND_DEBUG +echo $TEMP +ls $TEMP +echo $TMP +ls $TMP ls / which sh which bash From 0a8b7b957cb4e7fcf840de1607977ee129fd0bbf Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 11:57:43 +0100 Subject: [PATCH 65/84] Adding more tmp directory checks --- .github/workflows/browser.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index bec53ca06226..dc95c5eee0f6 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -138,7 +138,9 @@ jobs: run: | export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} export BASH=/usr/bin/bash + ls -l /tmp mkdir -p /tmp + ls -l /tmp cp "taintfox_mozconfig_win" ".mozconfig" ./mach --no-interactive bootstrap --application-choice=browser From d4c02cb7fef5908bd7eeac0fa5fc6f6c07f3e669 Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 13:23:20 +0100 Subject: [PATCH 66/84] Double checking that tmp directory --- .github/workflows/browser.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index dc95c5eee0f6..e482b6e6a092 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -101,8 +101,6 @@ jobs: - name: Test Bash shell: bash run: | - ls /c/mozilla-build - ls -l / which bash echo "ls -l /" | bash echo "ls -l /tmp" | bash @@ -110,7 +108,10 @@ jobs: - name: Test Mozbuild shell: msys2 {0} run: | - ls /c/mozilla-build + echo "Mozilla Build" + ls -l /c/mozilla-build + echo "Msys2" + ls -l /c/mozilla-build/msys2/ which bash echo "ls -l /" | bash echo "ls -l /tmp" | bash From 89a79588c6134d06f44634afa901ad52e164547d Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 13:34:26 +0100 Subject: [PATCH 67/84] Try linking to system version of msys2 --- .github/workflows/browser.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index e482b6e6a092..6c131322eaa0 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -91,6 +91,8 @@ jobs: cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help where bash echo "ls -l /" | bash.exe + rm -rf "C:\mozilla-build\msys2" + mklink /D "C:\msys64" "C:\mozilla-build\msys2" - name: Setup Msys2 uses: msys2/setup-msys2@v2 From d0268b3aa5cd7b599bd9ffc45131bd7f4d4133d6 Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 13:40:29 +0100 Subject: [PATCH 68/84] Use powershell arguments --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 6c131322eaa0..2953172cb344 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -91,7 +91,7 @@ jobs: cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help where bash echo "ls -l /" | bash.exe - rm -rf "C:\mozilla-build\msys2" + rm -Recuse -Force "C:\mozilla-build\msys2" mklink /D "C:\msys64" "C:\mozilla-build\msys2" - name: Setup Msys2 From 883143fc0de4ec2189550547eaefb5abf6bdfd9e Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 16:07:08 +0100 Subject: [PATCH 69/84] Install the moztools directly --- .github/workflows/browser.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 2953172cb344..1e871346a22c 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -82,17 +82,19 @@ jobs: - name: Download mozbuild run: | Set-PSDebug -Trace 1 - mkdir -p C:\mozilla-build - cd C:\mozilla-build + #mkdir -p C:\mozilla-build + #cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe - &'C:\Program Files\7-Zip\7z.exe' x -r -y .\MozillaBuildSetup-Latest.exe + &'.\MozillaBuildSetup-Latest.exe' /S /D=C:\mozilla-build + #&'C:\Program Files\7-Zip\7z.exe' x -r -y .\MozillaBuildSetup-Latest.exe + rm MozillaBuildSetup-Latest.exe pwd ls cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help where bash echo "ls -l /" | bash.exe - rm -Recuse -Force "C:\mozilla-build\msys2" - mklink /D "C:\msys64" "C:\mozilla-build\msys2" + #rm -Recuse -Force "C:\mozilla-build\msys2" + #mklink /D "C:\msys64" "C:\mozilla-build\msys2" - name: Setup Msys2 uses: msys2/setup-msys2@v2 From 8c34cc6ba106c27e2972a234c38a0193497affda Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 16:14:37 +0100 Subject: [PATCH 70/84] Remove comments --- .github/workflows/browser.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 1e871346a22c..e3de9567601a 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -82,19 +82,14 @@ jobs: - name: Download mozbuild run: | Set-PSDebug -Trace 1 - #mkdir -p C:\mozilla-build - #cd C:\mozilla-build Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe &'.\MozillaBuildSetup-Latest.exe' /S /D=C:\mozilla-build - #&'C:\Program Files\7-Zip\7z.exe' x -r -y .\MozillaBuildSetup-Latest.exe rm MozillaBuildSetup-Latest.exe pwd ls cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help where bash echo "ls -l /" | bash.exe - #rm -Recuse -Force "C:\mozilla-build\msys2" - #mklink /D "C:\msys64" "C:\mozilla-build\msys2" - name: Setup Msys2 uses: msys2/setup-msys2@v2 From 63d7c8b864a782cb19679ae3b57b276d3ef07d45 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 5 Feb 2025 16:20:06 +0100 Subject: [PATCH 71/84] Remove tabs --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index e3de9567601a..20102491d5e7 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -84,7 +84,7 @@ jobs: Set-PSDebug -Trace 1 Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe &'.\MozillaBuildSetup-Latest.exe' /S /D=C:\mozilla-build - rm MozillaBuildSetup-Latest.exe + rm MozillaBuildSetup-Latest.exe pwd ls cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help From a77b877e0f02b536888ac51f7baba5b75cedaa81 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 5 Feb 2025 16:22:24 +0100 Subject: [PATCH 72/84] Don't delete mozbuildsetup --- .github/workflows/browser.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 20102491d5e7..17fd64f01c18 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -84,12 +84,9 @@ jobs: Set-PSDebug -Trace 1 Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe &'.\MozillaBuildSetup-Latest.exe' /S /D=C:\mozilla-build - rm MozillaBuildSetup-Latest.exe pwd - ls + ls C:\mozilla-build cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help - where bash - echo "ls -l /" | bash.exe - name: Setup Msys2 uses: msys2/setup-msys2@v2 From 18afe925d3a1d6e23988ce4a287e458a3ab4895a Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 5 Feb 2025 16:25:16 +0100 Subject: [PATCH 73/84] Attempt to use execwait --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 17fd64f01c18..706013a50791 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -83,7 +83,7 @@ jobs: run: | Set-PSDebug -Trace 1 Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe - &'.\MozillaBuildSetup-Latest.exe' /S /D=C:\mozilla-build + ExecWait "'.\MozillaBuildSetup-Latest.exe' /S /D=C:\mozilla-build" pwd ls C:\mozilla-build cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help From 362ed00316c15b248852fc60acf0a30f8012a754 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 5 Feb 2025 16:37:49 +0100 Subject: [PATCH 74/84] Use start process to wait for installation --- .github/workflows/browser.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 706013a50791..15d1389f4203 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -83,10 +83,11 @@ jobs: run: | Set-PSDebug -Trace 1 Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe - ExecWait "'.\MozillaBuildSetup-Latest.exe' /S /D=C:\mozilla-build" + Start-Process .\MozillaBuildSetup-Latest.exe -ArgumentList '/S /D=C:\mozilla-build' -Wait pwd ls C:\mozilla-build cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help + rm .\MozillaBuildSetup-Latest.exe - name: Setup Msys2 uses: msys2/setup-msys2@v2 From e76fb0adf599ea9c68af9b6bd78ccb20e921c855 Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Wed, 5 Feb 2025 16:42:30 +0100 Subject: [PATCH 75/84] See if the build will work --- .github/workflows/browser.yml | 23 ++++++++--------------- taintfox_mozconfig_win | 15 ++------------- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 15d1389f4203..35a15ea9f589 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -134,22 +134,15 @@ jobs: - name: Bootstrap shell: msys2 {0} run: | - export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} - export BASH=/usr/bin/bash - ls -l /tmp - mkdir -p /tmp - ls -l /tmp cp "taintfox_mozconfig_win" ".mozconfig" ./mach --no-interactive bootstrap --application-choice=browser -# - name: Build -# shell: msys2 {0} -# run: | -# export PATH=${PATH}:/c/mozilla-build/python3 -# ./mach build + - name: Build + shell: msys2 {0} + run: | + ./mach build -# - name: Package -# shell: msys2 {0} -# run: | -# export PATH=${PATH}:/c/mozilla-build/python3 -# ./mach package + - name: Package + shell: msys2 {0} + run: | + ./mach package diff --git a/taintfox_mozconfig_win b/taintfox_mozconfig_win index 30f9c170fa58..371fbe67c194 100644 --- a/taintfox_mozconfig_win +++ b/taintfox_mozconfig_win @@ -1,14 +1,3 @@ -echo FOXHOUND_DEBUG -echo $TEMP -ls $TEMP -echo $TMP -ls $TMP -ls / -which sh -which bash -sh --help -bash --help - # limit number of parallel jobs - do not do this by default, but might be needed for build systems with limited resources # mk_add_options MOZ_PARALLEL_BUILD=4 @@ -46,8 +35,8 @@ export MOZ_PACKAGE_JSSHELL=1 # ac_add_options --with-app-name=foxhound mk_add_options MOZ_APP_NAME=foxhound -#mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tf-release -ac_add_options --disable-tests +mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tf-release +#ac_add_options --disable-tests ac_add_options --disable-sandbox ac_add_options --without-wasm-sandboxed-libraries ac_add_options --disable-crashreporter From 8b53cbcb5e4c4ad82a829c3f2df0e43290b5cc0d Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 5 Feb 2025 17:39:36 +0100 Subject: [PATCH 76/84] Add python back to the path --- .github/workflows/browser.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 35a15ea9f589..228bd2e7ac00 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -134,15 +134,18 @@ jobs: - name: Bootstrap shell: msys2 {0} run: | + export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} cp "taintfox_mozconfig_win" ".mozconfig" ./mach --no-interactive bootstrap --application-choice=browser - name: Build shell: msys2 {0} run: | + export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} ./mach build - name: Package shell: msys2 {0} run: | + export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} ./mach package From 63599162cb99588bf737ae574f3042def049adea Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 5 Feb 2025 17:57:31 +0100 Subject: [PATCH 77/84] See if the powershell mach will work for us now --- .github/workflows/browser.yml | 47 ++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 228bd2e7ac00..3a6e4410ab46 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -120,32 +120,33 @@ jobs: with: fetch-depth: 1 -# - name: Bootstrap -# run: | -# cp "taintfox_mozconfig_win" ".mozconfig" -# .\mach.ps1 --no-interactive bootstrap --application-choice=browser -# - name: Build -# run: | -# .\mach.ps1 build -# - name: Package -# run: | -# .\mach.ps1 package - - name: Bootstrap - shell: msys2 {0} run: | - export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} - cp "taintfox_mozconfig_win" ".mozconfig" - ./mach --no-interactive bootstrap --application-choice=browser - + cp "taintfox_mozconfig_win" ".mozconfig" + .\mach.ps1 --no-interactive bootstrap --application-choice=browser - name: Build - shell: msys2 {0} run: | - export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} - ./mach build - + .\mach.ps1 build - name: Package - shell: msys2 {0} run: | - export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} - ./mach package + .\mach.ps1 package + +# - name: Bootstrap +# shell: msys2 {0} +# run: | +# export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} +# cp "taintfox_mozconfig_win" ".mozconfig" +# ./mach --no-interactive bootstrap --application-choice=browser + +# - name: Build +# shell: msys2 {0} +# run: | +# export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} +# ./mach build + +# - name: Package +# shell: msys2 {0} +# run: | +# export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} +# ./mach package +# From 01c33959ce7a7b68d788ee728718ea90cebf6cc4 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:30:45 +0100 Subject: [PATCH 78/84] Try downgrading the rust version --- .github/workflows/browser.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index 3a6e4410ab46..f4bc829ea661 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -122,8 +122,10 @@ jobs: - name: Bootstrap run: | - cp "taintfox_mozconfig_win" ".mozconfig" + cp "taintfox_mozconfig_win" ".mozconfig" .\mach.ps1 --no-interactive bootstrap --application-choice=browser + rustup install 1.76.0 + rustup default 1.76.0 - name: Build run: | .\mach.ps1 build From 1fd9efde2fbe17c3cd25e47c6375aa5a6341dc3e Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Thu, 6 Feb 2025 08:58:40 +0100 Subject: [PATCH 79/84] Get rust version from the PLAYWRIGHT_VERSION file --- .github/workflows/browser.yml | 55 ++++------------------------------- 1 file changed, 6 insertions(+), 49 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index f4bc829ea661..b5bac6b0f134 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -84,37 +84,9 @@ jobs: Set-PSDebug -Trace 1 Invoke-WebRequest https://ftp.mozilla.org/pub/mozilla/libraries/win32/MozillaBuildSetup-Latest.exe -OutFile .\MozillaBuildSetup-Latest.exe Start-Process .\MozillaBuildSetup-Latest.exe -ArgumentList '/S /D=C:\mozilla-build' -Wait - pwd - ls C:\mozilla-build cmd.exe /c 'C:\mozilla-build\start-shell.bat' --help rm .\MozillaBuildSetup-Latest.exe - - name: Setup Msys2 - uses: msys2/setup-msys2@v2 - with: - release: false - msystem: MSYS - - - name: Test Bash - shell: bash - run: | - which bash - echo "ls -l /" | bash - echo "ls -l /tmp" | bash - - - name: Test Mozbuild - shell: msys2 {0} - run: | - echo "Mozilla Build" - ls -l /c/mozilla-build - echo "Msys2" - ls -l /c/mozilla-build/msys2/ - which bash - echo "ls -l /" | bash - echo "ls -l /tmp" | bash - sh --help - bash --help - - name: Checkout release branch uses: actions/checkout@v4 with: @@ -124,31 +96,16 @@ jobs: run: | cp "taintfox_mozconfig_win" ".mozconfig" .\mach.ps1 --no-interactive bootstrap --application-choice=browser - rustup install 1.76.0 - rustup default 1.76.0 + $env:RUST_VERSION=$(((Get-Content .\.PLAYWRIGHT_VERSION | select-string RUST_VERSION) -Split "=")[1]) + echo "Installing $env:RUST_VERSION from .PLAYWRIGHT_VERSION" + rustup install $env:RUST_VERSION + rustup default $env:RUST_VERSION + - name: Build run: | .\mach.ps1 build + - name: Package run: | .\mach.ps1 package -# - name: Bootstrap -# shell: msys2 {0} -# run: | -# export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} -# cp "taintfox_mozconfig_win" ".mozconfig" -# ./mach --no-interactive bootstrap --application-choice=browser - -# - name: Build -# shell: msys2 {0} -# run: | -# export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} -# ./mach build - -# - name: Package -# shell: msys2 {0} -# run: | -# export PATH=/c/mozilla-build/bin:/c/mozilla-build/python3:${PATH} -# ./mach package -# From 5d31038fc29a73e57c95ee64cdcb1d9eaaa09b22 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Thu, 6 Feb 2025 09:15:00 +0100 Subject: [PATCH 80/84] Remove quotes from Rust version --- .github/workflows/browser.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index b5bac6b0f134..a45c2fd710c3 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -96,7 +96,7 @@ jobs: run: | cp "taintfox_mozconfig_win" ".mozconfig" .\mach.ps1 --no-interactive bootstrap --application-choice=browser - $env:RUST_VERSION=$(((Get-Content .\.PLAYWRIGHT_VERSION | select-string RUST_VERSION) -Split "=")[1]) + $env:RUST_VERSION=$((((Get-Content .\.PLAYWRIGHT_VERSION | select-string RUST_VERSION) -Split "=")[1] -Split '"')[1]) echo "Installing $env:RUST_VERSION from .PLAYWRIGHT_VERSION" rustup install $env:RUST_VERSION rustup default $env:RUST_VERSION From 743654e95dd521ccdc85451547afe9ad6140d748 Mon Sep 17 00:00:00 2001 From: Thomas Barber Date: Thu, 6 Feb 2025 09:19:25 +0100 Subject: [PATCH 81/84] Removing debug prints --- build/autoconf/autoconf.sh | 1 - python/mozbuild/mozbuild/mozconfig.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/build/autoconf/autoconf.sh b/build/autoconf/autoconf.sh index ab7860b1d15e..ceb8a25b00af 100644 --- a/build/autoconf/autoconf.sh +++ b/build/autoconf/autoconf.sh @@ -20,7 +20,6 @@ # If given no args, create `configure' from template file `configure.in'. # With one arg, create a configure script on standard output from # the given template file. -echo "FOXHOUND DEBUG: $0" usage="\ Usage: autoconf [-h] [--help] [-m dir] [--macrodir=dir] diff --git a/python/mozbuild/mozbuild/mozconfig.py b/python/mozbuild/mozbuild/mozconfig.py index 07f70dce753b..4322acbeed25 100644 --- a/python/mozbuild/mozbuild/mozconfig.py +++ b/python/mozbuild/mozbuild/mozconfig.py @@ -159,8 +159,6 @@ def read_mozconfig(self, path=None): mozpath.join(mozpath.dirname(self._loader_script), "action", "dump_env.py"), ] - print("FOXHOUND DEBUG:", command) - try: # We need to capture stderr because that's where the shell sends # errors if execution fails. From 393e4826beef7c0a9dc2fd60b3492ec462fc3bf0 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Thu, 6 Feb 2025 09:33:52 +0100 Subject: [PATCH 82/84] Adding a MacOS build --- .github/workflows/browser.yml | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index a45c2fd710c3..e2eb503b0baa 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -109,3 +109,30 @@ jobs: run: | .\mach.ps1 package + # Test complete build on MacOS + macos-build: + runs-on: macos-latest + + steps: + + - name: Checkout release branch + uses: actions/checkout@v4 + with: + fetch-depth: 1 + + - name: Bootstrap + run: | + cp "taintfox_mozconfig_ubuntu" ".mozconfig" + ./mach --no-interactive bootstrap --application-choice=browser + source .PLAYWRIGHT_VERSION + echo "Installing ${RUST_VERSION} from .PLAYWRIGHT_VERSION" + rustup install ${RUST_VERSION} + rustup default ${RUST_VERSION} + + - name: Build + run: | + ./mach build + + - name: Package + run: | + ./mach package From 20d1ac39833b660219ba2249d6d39ba296159717 Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Thu, 6 Feb 2025 09:38:00 +0100 Subject: [PATCH 83/84] Use python3.11 for mac build --- .github/workflows/browser.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index e2eb503b0baa..b16d3ee21131 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -123,7 +123,7 @@ jobs: - name: Bootstrap run: | cp "taintfox_mozconfig_ubuntu" ".mozconfig" - ./mach --no-interactive bootstrap --application-choice=browser + python3.11 ./mach --no-interactive bootstrap --application-choice=browser source .PLAYWRIGHT_VERSION echo "Installing ${RUST_VERSION} from .PLAYWRIGHT_VERSION" rustup install ${RUST_VERSION} @@ -131,8 +131,8 @@ jobs: - name: Build run: | - ./mach build + python3.11 ./mach build - name: Package run: | - ./mach package + python3.11 ./mach package From ffbcc22bd8bb9b5e78424f0bab51cf1f1105004c Mon Sep 17 00:00:00 2001 From: Thomas Barber <59735858+tmbrbr@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:45:56 +0100 Subject: [PATCH 84/84] Build on both Intel and M1 MacOS --- .github/workflows/browser.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/browser.yml b/.github/workflows/browser.yml index b16d3ee21131..b2345fd00263 100644 --- a/.github/workflows/browser.yml +++ b/.github/workflows/browser.yml @@ -111,7 +111,11 @@ jobs: # Test complete build on MacOS macos-build: - runs-on: macos-latest + strategy: + matrix: + # Build using both latest (M1 ARM) and macos-13 (Intel x86) + os: [macos-latest, macos-13] + runs-on: ${{ matrix.os }} steps: