asaa

larseggert · Nov 24, 2023 · d3b47b9 · d3b47b9
1 parent 36ead8e
commit d3b47b9
Showing 1 changed file with 44 additions and 43 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -40,59 +40,60 @@ jobs:
       #     echo "$(python3 -m site --user-base)/bin" >> $GITHUB_PATH
 
 
+      # - name: Install dependencies (Windows)
+      #   if: runner.os == 'Windows'
+      #   shell: bash
+      #   run: |
+      #     choco install --no-progress MozillaBuild
+      #     echo "C:/mozilla-build/bin" >> $GITHUB_PATH
+      #     echo "C:/mozilla-build/msys2/usr/bin" >> $GITHUB_PATH
+      #     echo "MOZILLABUILD=C:/mozilla-build" >> $GITHUB_ENV
+      #     echo "MOZBUILD_STATE_PATH=C:/mozbuild-state" >> $GITHUB_ENV
+      #     echo "GYP_MSVS_OVERRIDE_PATH=C:\Program Files\Microsoft Visual Studio\2022\Enterprise" >> $GITHUB_ENV
+      #     echo "GYP_MSVS_VERSION=2022" >> $GITHUB_ENV
+      #     # echo "OS_TARGET=WIN95" >> $GITHUB_ENV
+
+      # - name: Fetch NSS and NSPR
+      #   shell: bash
+      #   run: |
+      #     hg clone https://hg.mozilla.org/projects/nspr "$NSPR_DIR"
+      #     git clone --depth=1 https://github.com/nss-dev/nss "$NSS_DIR"
+      #     "$NSS_DIR"/build.sh -v --clang
+      #   env:
+      #     NSS_DIR: ${{ github.workspace }}/nss
+      #     NSPR_DIR: ${{ github.workspace }}/nspr
+
       - name: Install dependencies (Windows)
+        if: runner.os == 'Windows'
+        uses: msys2/setup-msys2@v2
+        with:
+          install: nsinstall ninja python-six mercurial git # gyp in msys2 is too old, install separately
+          # path-type: inherit
+
+      - name: Install more dependencies (Windows)
         if: runner.os == 'Windows'
         shell: bash
         run: |
-          choco install --no-progress MozillaBuild
-          echo "C:/mozilla-build/bin" >> $GITHUB_PATH
-          echo "C:/mozilla-build/msys2/usr/bin" >> $GITHUB_PATH
-          echo "MOZILLABUILD=C:/mozilla-build" >> $GITHUB_ENV
-          echo "MOZBUILD_STATE_PATH=C:/mozbuild-state" >> $GITHUB_ENV
+          python3 -m pip install gyp-next
+          # echo "OS_TARGET=WIN95" >> $GITHUB_ENV
           echo "GYP_MSVS_OVERRIDE_PATH=C:\Program Files\Microsoft Visual Studio\2022\Enterprise" >> $GITHUB_ENV
           echo "GYP_MSVS_VERSION=2022" >> $GITHUB_ENV
-          # echo "OS_TARGET=WIN95" >> $GITHUB_ENV
 
       - name: Fetch NSS and NSPR
         shell: bash
         run: |
-          hg clone https://hg.mozilla.org/projects/nspr "$NSPR_DIR"
-          git clone --depth=1 https://github.com/nss-dev/nss "$NSS_DIR"
-          "$NSS_DIR"/build.sh -v --clang
-        env:
-          NSS_DIR: ${{ github.workspace }}/nss
-          NSPR_DIR: ${{ github.workspace }}/nspr
-
-      # - name: Install dependencies (Windows)
-      #   if: runner.os == 'Windows'
-      #   uses: msys2/setup-msys2@v2
-      #   with:
-      #     install: nsinstall ninja python-six mercurial git # gyp in msys2 is too old, install separately
-      #     # path-type: inherit
-
-      # - name: Install more dependencies (Windows)
-      #   if: runner.os == 'Windows'
-      #   shell: bash
-      #   run: |
-      #     python3 -m pip install gyp-next
-      #     # echo "OS_TARGET=WIN95" >> $GITHUB_ENV
-      #     echo "GYP_MSVS_OVERRIDE_PATH=C:\Program Files\Microsoft Visual Studio\2022\Enterprise" >> $GITHUB_ENV
-      #     echo "GYP_MSVS_VERSION=2022" >> $GITHUB_ENV
-
-      # - name: Fetch NSS and NSPR
-      #   run: |
-      #     hg clone https://hg.mozilla.org/projects/nspr "${{ github.workspace }}\nspr"
-      #     git clone --depth=1 https://github.com/nss-dev/nss "${{ github.workspace }}\nss"
-      #     "${{ github.workspace }}\nss\build.sh" -v --msvc
-      #     # grep -Ri nologo "$NSS_DIR" || true
-      #     # grep -Ri nologo "$NSPR_DIR" || true
-      #     # find "$NSPR_DIR" -type f -exec sed -i 's/-nologo//gi' {} +
-      #     # find "$NSS_DIR" -type f -exec sed -i 's/-nologo//gi' {} +
-      #     # grep -Ri nologo "$NSS_DIR" || true
-      #     # grep -Ri nologo "$NSPR_DIR" || true
-      #   # env:
-      #   #   NSS_DIR: ${{ github.workspace }}/nss
-      #   #   NSPR_DIR: ${{ github.workspace }}/nspr
+          hg clone https://hg.mozilla.org/projects/nspr "${{ github.workspace }}\nspr"
+          git clone --depth=1 https://github.com/nss-dev/nss "${{ github.workspace }}\nss"
+          "${{ github.workspace }}\nss\build.sh" -v --msvc
+          # grep -Ri nologo "$NSS_DIR" || true
+          # grep -Ri nologo "$NSPR_DIR" || true
+          # find "$NSPR_DIR" -type f -exec sed -i 's/-nologo//gi' {} +
+          # find "$NSS_DIR" -type f -exec sed -i 's/-nologo//gi' {} +
+          # grep -Ri nologo "$NSS_DIR" || true
+          # grep -Ri nologo "$NSPR_DIR" || true
+        # env:
+        #   NSS_DIR: ${{ github.workspace }}/nss
+        #   NSPR_DIR: ${{ github.workspace }}/nspr
 
       # - name: Checkout
       #   uses: actions/checkout@v4