link

larseggert · Dec 8, 2023 · 7340668 · 7340668
1 parent b56cf9b
commit 7340668
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
@@ -42,7 +42,7 @@ jobs:
           # Above does not work, since pypi only has gyp 0.15.0, which is too old
           # for the homebrew python3. Install from source instead.
           python3 -m pip install git+https://github.com/nodejs/gyp-next
-          python3 -m pip install packaging
+          # python3 -m pip install packaging
           echo "$(python3 -m site --user-base)/bin" >> "$GITHUB_PATH"
 
       # - name: Install dependencies (Windows)
@@ -65,12 +65,10 @@ jobs:
           rm /usr/bin/link.exe
           echo "BASH=$SHELL" >> "$GITHUB_ENV"
           python3 -m pip install git+https://github.com/nodejs/gyp-next
-          python3 -m pip install packaging
+          # python3 -m pip install packaging
           echo "$(python3 -m site --user-base)/bin" >> "$GITHUB_PATH"
           echo "GYP_MSVS_OVERRIDE_PATH=$VSINSTALLDIR" >> $GITHUB_ENV
           echo "GYP_MSVS_VERSION=2022" >> $GITHUB_ENV
-          echo "C:\\msys64\\usr\\bin" >> $GITHUB_PATH
-          echo "C:\\msys64\\mingw64\\bin" >> $GITHUB_PATH
 
       # - name: Install Rust tools
       #   run: cargo +${{ matrix.rust-toolchain }} binstall --no-confirm cargo-llvm-cov cargo-nextest
@@ -90,6 +88,7 @@ jobs:
           echo "NSPR_DIR=$(cygpath $NSPR_DIR)" >> "$GITHUB_ENV"
           echo "NSS_JOBS=$NUMBER_OF_PROCESSORS" >> "$GITHUB_ENV"
           echo go
+          rm /usr/bin/link.exe
           # find "$NSPR_DIR" -name Makefile.in -exec sed -i.bak -e 's|$(NSINSTALL) -D|mkdir -p|g' -e 's|$(NSINSTALL) -t|install -p|g' {} \;
           # hg diff "$NSPR_DIR"
           # sed -i.bak -e 's|$(NSINSTALL) -D|mkdir -p|g' "$NSPR_DIR"/pr/include/md/Makefile.in