don't bother caching lists

moraea · Aug 8, 2023 · d32c393 · d32c393
1 parent 353d882
commit d32c393
Showing 1 changed file with 6 additions and 10 deletions.
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
@@ -17,7 +17,7 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Set permissions
-      run: sudo chmod -R a+rwx /var/cache/apt/archives /etc/apt/trusted.gpg.d /etc/apt/sources.list.d /var/lib/apt/lists
+      run: sudo chmod -R a+rwx /var/cache/apt/archives /etc/apt/keyrings /etc/apt/sources.list.d
 
     - name: Get codename
       run: |
@@ -33,20 +33,17 @@ jobs:
           /var/cache/apt/archives/**.deb
           !/var/cache/apt/archives/partial
           !/var/cache/apt/archives/lock
-          /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+          /etc/apt/keyrings/apt.llvm.org.asc
           /etc/apt/sources.list.d/llvm.list
-          /var/lib/apt/lists/*
-          !/var/lib/apt/lists/partial
-          !/var/lib/apt/lists/lock
 
     - name: Add LLVM repo
       if: steps.cache.outputs.cache-hit != 'true'
       run: |
-        if [[ ! -f /etc/apt/trusted.gpg.d/apt.llvm.org.asc ]]; then
+        if [[ ! -f /etc/apt/keyrings/apt.llvm.org.asc ]]; then
             # download GPG key once
-            wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc
+            wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | sudo tee /etc/apt/keyrings/apt.llvm.org.asc
         fi
-        echo "deb http://apt.llvm.org/${{ env.UBUNTU_CODENAME }}/ llvm-toolchain-${{ env.UBUNTU_CODENAME }}-${{ env.LLVM_VERSION}} main" | sudo tee /etc/apt/sources.list.d/llvm.list
+        echo "deb [signed-by=/etc/apt/keyrings/apt.llvm.org.asc] http://apt.llvm.org/${{ env.UBUNTU_CODENAME }}/ llvm-toolchain-${{ env.UBUNTU_CODENAME }}-${{ env.LLVM_VERSION}} main" | sudo tee /etc/apt/sources.list.d/llvm.list
 
     - uses: cpp-linter/cpp-linter-action@v2
       id: linter
@@ -66,5 +63,4 @@ jobs:
         exit 1
 
     - name: Set permissions
-      run: sudo chmod -R a+rwx /var/cache/apt/archives /etc/apt/trusted.gpg.d /etc/apt/sources.list.d /var/lib/apt/lists
-
+      run: sudo chmod -R a+rwx /var/cache/apt/archives /etc/apt/keyrings /etc/apt/sources.list.d