github actions cache fixes

google · Feb 21, 2024 · 33a1863 · 33a1863
1 parent 4fda14e
commit 33a1863
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 28 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,10 +19,10 @@ jobs:
         uses: actions/setup-node@v1
         with:
           node-version: ${{ matrix.node-version }}
-      - uses: actions/cache@v2
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-${{ matrix.node-version }}-node_modules-${{ hashFiles('**/package-lock.json') }}
+      # - uses: actions/cache@v2
+      #   with:
+      #     path: "**/node_modules"
+      #     key: ${{ runner.os }}-${{ matrix.node-version }}-node_modules-${{ hashFiles('**/package-lock.json') }}
       - run: npm install
       - run: npm run format:fix
       - name: Check for dirty working directory
@@ -73,23 +73,23 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.python-version }}
-      - uses: actions/cache@v2
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-${{ matrix.node-version }}-node_modules-${{ hashFiles('**/package-lock.json') }}
-      - name: Get pip cache dir
-        id: pip-cache
-        run: |
-          echo "::set-output name=dir::$(pip cache dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.py') }}
+      # - uses: actions/cache@v2
+      #   with:
+      #     path: "**/node_modules"
+      #     key: ${{ runner.os }}-${{ matrix.node-version }}-node_modules-${{ hashFiles('**/package-lock.json') }}
+      # - name: Get pip cache dir
+      #   id: pip-cache
+      #   run: |
+      #     echo "::set-output name=dir::$(pip cache dir)"
+      # - uses: actions/cache@v2
+      #   with:
+      #     path: ${{ steps.pip-cache.outputs.dir }}
+      #     key: ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ hashFiles('setup.py') }}
       # Uncomment the action below for an interactive shell
       # - name: Setup tmate session
       #   uses: mxschmitt/action-tmate@v3
       - name: Install Python packaging/test tools
-        run: python -m pip install --upgrade pip tox nox wheel numpy -rpython/requirements-test.txt
+        run: python -m pip install --upgrade pip tox nox wheel numpy -r python/requirements-test.txt
       - uses: ./.github/actions/setup-firefox
       - run: nox -s lint format mypy
       - name: Check for dirty working directory
@@ -137,18 +137,18 @@ jobs:
         uses: actions/setup-python@v2
         with:
           python-version: 3.x
-      - uses: actions/cache@v2
-        with:
-          path: "**/node_modules"
-          key: ${{ runner.os }}-${{ matrix.node-version }}-node_modules-${{ hashFiles('**/package-lock.json') }}
+      # - uses: actions/cache@v2
+      #   with:
+      #     path: "**/node_modules"
+      #     key: ${{ runner.os }}-${{ matrix.node-version }}-node_modules-${{ hashFiles('**/package-lock.json') }}
       - name: Get pip cache dir
         id: pip-cache
         run: |
           echo "::set-output name=dir::$(pip cache dir)"
-      - uses: actions/cache@v2
-        with:
-          path: ${{ steps.pip-cache.outputs.dir }}
-          key: ${{ runner.os }}-buildwheel-${{ hashFiles('setup.py') }}
+      # - uses: actions/cache@v2
+      #   with:
+      #     path: ${{ steps.pip-cache.outputs.dir }}
+      #     key: ${{ runner.os }}-buildwheel-${{ hashFiles('setup.py') }}
       - run: npm install
       - run: |
           build_info="{'tag':'$(git describe --always --tags)', 'url':'https://github.com/google/neuroglancer/commit/$(git rev-parse HEAD)', 'timestamp':'$(date)'}"

diff --git a/python/build_tools/cibuildwheel.sh b/python/build_tools/cibuildwheel.sh
@@ -2,7 +2,7 @@
 
 export CIBW_ARCHS_MACOS="x86_64 arm64"
 export CIBW_SKIP="cp27-* cp36-* cp37-* cp38-* pp* *_i686 *-win32 *-musllinux*"
-export CIBW_TEST_REQUIRES="-r{project}/python/requirements-test.txt"
+export CIBW_TEST_REQUIRES="-r python/requirements-test.txt"
 export CIBW_TEST_COMMAND="python -m pytest {project}/python/tests -vv -s --skip-browser-tests"
 export CIBW_MANYLINUX_X86_64_IMAGE=manylinux2014
 export CIBW_ENVIRONMENT_PASS_LINUX="NEUROGLANCER_BUILD_BUNDLE_INPLACE"

diff --git a/tox.ini b/tox.ini
@@ -10,8 +10,8 @@ skip_missing_interpreters = true
 deps =
   numpy
   tensorstore
-  -r{toxinidir}/python/requirements-test.txt
-  chrome,firefox: -r{toxinidir}/python/requirements-test-browser.txt
+  -r {toxinidir}/python/requirements-test.txt
+  chrome,firefox: -r {toxinidir}/python/requirements-test-browser.txt
 
 extras =
   test