Merge pull request #46 from troykelly/45-update-cuda-and-ffmpeg

Version bump
troykelly · Jul 16, 2023 · fe0d220 · fe0d220
2 parents aaba37b + b17aa4a
commit fe0d220
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 63 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -58,7 +58,7 @@ jobs:
   build:
     strategy:
       matrix:
-        version: [12.0.1, 12.0.0, 11.8.0, 11.7.1, 11.7.0]
+        version: [12.2.0, 12.0.1, 12.0.0, 11.8.0]
         os: [ubuntu22.04]
     name: 👷 Build CUDA ${{ matrix.version }} on ${{ matrix.os }}
     needs:
@@ -68,15 +68,6 @@ jobs:
       - name: ⤵️ Check out code from GitHub
         uses: actions/checkout@v3
 
-      - name: Install Latest Docker
-        # yamllint disable rule:line-length
-        run: |
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-          sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu  $(lsb_release -cs)  stable"
-          sudo apt-get update
-          sudo apt-get install docker-ce
-        # yamllint enable rule:line-length
-
       - name: 📝 Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -96,17 +87,7 @@ jobs:
             type=ref,event=pr,prefix=${{ matrix.version }}-${{ matrix.os }}-
             type=sha,prefix=${{ matrix.version }}-${{ matrix.os }}-
             type=edge,enable=true,priority=700prefix=${{ matrix.version }}-${{ matrix.os }}-,suffix=,branch=$repo.default_branch
-            type=edge,enable=${{ matrix.version == '12.0.1' && matrix.os == 'ubuntu22.04' }},prefix=,suffix=
-
-      - name: 🏗 Set up build cache
-        id: cache
-        uses: actions/cache@v3.3.1
-        with:
-          path: /tmp/.buildx-cache
-          # Key is named differently to avoid collision
-          key: ${{ runner.os }}-multi-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-multi-buildx
+            type=edge,enable=${{ matrix.version == '12.2.0' && matrix.os == 'ubuntu22.04' }},prefix=,suffix=
 
       - name: 🏗 Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -138,8 +119,8 @@ jobs:
           file: ./xteve/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           # yamllint disable-line rule:line-length
           # platforms: linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64/v8
           platforms: linux/amd64
@@ -152,14 +133,6 @@ jobs:
             BUILD_VERSION=${{ needs.information.outputs.version }}
             CUDA=${{ matrix.version }}
             OS=${{ matrix.os }}
-      # This ugly bit is necessary, or our cache will grow forever...
-      # Well until we hit GitHub's limit of 5GB :)
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      - name: 🚚 Swap build cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
 
   dependabot:
     runs-on: ubuntu-latest

diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -60,7 +60,7 @@ jobs:
   deploy:
     strategy:
       matrix:
-        version: [12.0.1, 12.0.0, 11.8.0, 11.7.1, 11.7.0]
+        version: [12.2.0, 12.0.1, 12.0.0, 11.8.0]
         os: [ubuntu22.04]
     name: 👷 Build & Deploy CUDA ${{ matrix.version }} on ${{ matrix.os }}
     needs:
@@ -70,15 +70,6 @@ jobs:
       - name: ⤵️ Check out code from GitHub
         uses: actions/checkout@v3
 
-      - name: Install Latest Docker
-        # yamllint disable rule:line-length
-        run: |
-          curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-          sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu  $(lsb_release -cs)  stable"
-          sudo apt-get update
-          sudo apt-get install docker-ce
-        # yamllint enable rule:line-length
-
       - name: 📝 Docker meta
         id: meta
         uses: docker/metadata-action@v4
@@ -102,19 +93,9 @@ jobs:
             type=semver,pattern={{major}},prefix=${{ matrix.version }}-${{ matrix.os }}-
             type=sha,prefix=${{ matrix.version }}-${{ matrix.os }}-
             type=raw,value=${{ matrix.version }}-${{ matrix.os }}-latest,enable=${{ startsWith(github.ref, 'refs/tags/v') }},prefix=,suffix=
-            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') && matrix.version == '12.0.1' && matrix.os == 'ubuntu22.04' }},prefix=,suffix=
+            type=raw,value=latest,enable=${{ startsWith(github.ref, 'refs/tags/v') && matrix.version == '12.2.0' && matrix.os == 'ubuntu22.04' }},prefix=,suffix=
           # yamllint enable rule:line-length
 
-      - name: 🏗 Set up build cache
-        id: cache
-        uses: actions/cache@v3.3.1
-        with:
-          path: /tmp/.buildx-cache
-          # Key is named differently to avoid collision
-          key: ${{ runner.os }}-multi-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-multi-buildx
-
       - name: 🏗 Set up QEMU
         uses: docker/setup-qemu-action@v2
 
@@ -145,8 +126,8 @@ jobs:
           file: ./xteve/Dockerfile
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-new
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
           # yamllint disable-line rule:line-length
           # platforms: linux/amd64,linux/386,linux/arm/v6,linux/arm/v7,linux/arm64/v8
           platforms: linux/amd64
@@ -159,11 +140,3 @@ jobs:
             BUILD_VERSION=${{ needs.information.outputs.version }}
             CUDA=${{ matrix.version }}
             OS=${{ matrix.os }}
-      # This ugly bit is necessary, or our cache will grow forever...
-      # Well until we hit GitHub's limit of 5GB :)
-      # https://github.com/docker/build-push-action/issues/252
-      # https://github.com/moby/buildkit/issues/1896
-      - name: 🚚 Swap build cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
diff --git a/xteve/Dockerfile b/xteve/Dockerfile
@@ -1,4 +1,4 @@
-ARG CUDA=12.0.1
+ARG CUDA=12.2.0
 ARG OS=ubuntu22.04
 FROM ghcr.io/aperim/nvidia-cuda-ffmpeg:${CUDA}-${OS}-latest
 ARG CUDA