change path in cache

pmqs · Aug 6, 2023 · 5bba17b · 5bba17b
1 parent 3c4c62a
commit 5bba17b
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/.github/workflows/linux-upstream-gh-xz.yml b/.github/workflows/linux-upstream-gh-xz.yml
@@ -34,17 +34,27 @@ jobs:
 
     - name: Set Env
       run: |
-        echo "lzma-source=${GITHUB_WORKSPACE}/upstream-lzma-source-${{ matrix.lzma-version }}"  >> $GITHUB_ENV
-        echo "lzma-install=${HOME}/upstream-lzma-install-${{ matrix.lzma-version }}"            >> $GITHUB_ENV
-        echo "LIBLZMA_LIB=${HOME}/upstream-lzma-install-${{ matrix.lzma-version }}/lib"         >> $GITHUB_ENV
-        echo "LIBLZMA_INCLUDE=${HOME}/upstream-lzma-install-${{ matrix.lzma-version }}/include" >> $GITHUB_ENV
-        echo "LZMA_VERSION=${{ matrix.lzma-version }}"                                          >> $GITHUB_ENV
+        echo "lzma-source=${GITHUB_WORKSPACE}/upstream-lzma-source"   >> $GITHUB_ENV
+        echo "lzma-install=${HOME}/upstream-lzma-install"             >> $GITHUB_ENV
+        echo "LIBLZMA_LIB=${HOME}/upstream-lzma-install}/lib"         >> $GITHUB_ENV
+        echo "LIBLZMA_INCLUDE=${HOME}/upstream-lzma-install}/include" >> $GITHUB_ENV
+        echo "LZMA_VERSION=${{ matrix.lzma-version }}"                >> $GITHUB_ENV
+
+      # run: |
+        # echo "lzma-source=${GITHUB_WORKSPACE}/upstream-lzma-source-${{ matrix.lzma-version }}"  >> $GITHUB_ENV
+        # echo "lzma-install=${HOME}/upstream-lzma-install-${{ matrix.lzma-version }}"            >> $GITHUB_ENV
+        # echo "LIBLZMA_LIB=${HOME}/upstream-lzma-install-${{ matrix.lzma-version }}/lib"         >> $GITHUB_ENV
+        # echo "LIBLZMA_INCLUDE=${HOME}/upstream-lzma-install-${{ matrix.lzma-version }}/include" >> $GITHUB_ENV
+        # echo "LZMA_VERSION=${{ matrix.lzma-version }}"                                          >> $GITHUB_ENV
+
 
     - name: Cache lzma ${{matrix.lzma-version}}
       id: cache-lzma
       uses: actions/cache@v3
       with:
-        path: ${HOME}/upstream-lzma-install-${{ matrix.lzma-version }}
+        # NOTE: path doesn't expand variables!
+        path: /home/runner/upstream-lzma-install
+        # path: /home/runner/upstream-lzma-install-${{ matrix.lzma-version }}
         key: ${{ runner.os }}-lzma-${{ matrix.lzma-version }}
 
     #   # Install Autotools on Linux
@@ -54,7 +64,7 @@ jobs:
     #     sudo apt-get install -y autoconf automake build-essential po4a autopoint gcc-multilib doxygen
 
     - name: Checkout upstream lzma ${{matrix.lzma-version}}
-      if: steps.cache-lzma-${{matrix.lzma-version}}.outputs.cache-hit != 'true'
+      if: steps.cache-lzma.outputs.cache-hit != 'true'
       uses: actions/checkout@v3
       with:
         repository: tukaani-project/xz
@@ -77,7 +87,7 @@ jobs:
 
     # CMake-based build
     - name: Build lzma ${{matrix.lzma-version}}
-      if: steps.cache-lzma-${{matrix.lzma-version}}.outputs.cache-hit != 'true'
+      if: steps.cache-lzma.outputs.cache-hit != 'true'
       run: |
         mkdir ${GITHUB_WORKSPACE}/build-xz
         cd ${GITHUB_WORKSPACE}/build-xz