From 1fa09d16210f825ea5aee5d87294c957d405a108 Mon Sep 17 00:00:00 2001
From: Otto Richter <git@otto.splvs.net>
Date: Sat, 28 Sep 2024 03:39:19 +0200
Subject: [PATCH] Split Git package installation

---
 .../composite/apt-install-from/action.yaml    | 29 +++++++++++
 .forgejo/workflows/testing.yml                | 50 ++++++-------------
 2 files changed, 44 insertions(+), 35 deletions(-)
 create mode 100644 .forgejo/workflows/composite/apt-install-from/action.yaml

diff --git a/.forgejo/workflows/composite/apt-install-from/action.yaml b/.forgejo/workflows/composite/apt-install-from/action.yaml
new file mode 100644
index 0000000000..615e7cb184
--- /dev/null
+++ b/.forgejo/workflows/composite/apt-install-from/action.yaml
@@ -0,0 +1,29 @@
+inputs:
+  packages:
+    description: 'Packages to install'
+    required: true
+  release:
+    description: 'Release to install from'
+    default: testing
+
+runs:
+  using: "composite"
+  steps:
+    - name: setup apt package source
+      run: |
+        export DEBIAN_FRONTEND=noninteractive
+        echo "deb http://deb.debian.org/debian/ ${RELEASE} main" > "/etc/apt/sources.list.d/${RELEASE}.list"
+      env:
+        RELEASE: ${{inputs.release}}
+    - name: install packages
+      run: |
+        apt-get update -qq
+        apt-get -q install -qq -y ${PACKAGES}
+      env:
+        PACKAGES: ${{inputs.packages}}
+    - name: remove temporary package list to prevent using it in other steps
+      run: |
+        rm "/etc/apt/sources.list.d/${RELEASE}.list"
+        apt-get update -qq
+      env:
+        RELEASE: ${{inputs.release}}
diff --git a/.forgejo/workflows/testing.yml b/.forgejo/workflows/testing.yml
index 5f7a1e351a..8c1e6d06f8 100644
--- a/.forgejo/workflows/testing.yml
+++ b/.forgejo/workflows/testing.yml
@@ -60,13 +60,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install git >= 2.42
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          echo deb http://deb.debian.org/debian/ testing  main > /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
-          apt-get -q install -qq -y git
-          rm /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
+        uses: ./.forgejo/workflows/composite/apt-install-from
+        with:
+          packages: git
       - name: test release-notes-assistant.sh
         run: |
           apt-get -q install -qq -y jq
@@ -108,13 +104,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install git >= 2.42
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          echo deb http://deb.debian.org/debian/ testing  main > /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
-          apt-get -q install -qq -y git
-          rm /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
+        uses: ./.forgejo/workflows/composite/apt-install-from
+        with:
+          packages: git
       - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-remote-cacher test-check'
@@ -143,13 +135,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          echo deb http://deb.debian.org/debian/ testing  main > /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
-          apt-get install --no-install-recommends -qq -y git git-lfs
-          rm /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
+        uses: ./.forgejo/workflows/composite/apt-install-from
+        with:
+          packages: git git-lfs
       - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-mysql-migration test-mysql'
@@ -179,13 +167,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          echo deb http://deb.debian.org/debian/ testing  main > /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
-          apt-get install --no-install-recommends -qq -y git git-lfs
-          rm /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
+        uses: ./.forgejo/workflows/composite/apt-install-from
+        with:
+          packages: git git-lfs
       - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-pgsql-migration test-pgsql'
@@ -204,13 +188,9 @@ jobs:
       - uses: https://code.forgejo.org/actions/checkout@v3
       - uses: ./.forgejo/workflows/composite/setup-env
       - name: install dependencies & git >= 2.42
-        run: |
-          export DEBIAN_FRONTEND=noninteractive
-          echo deb http://deb.debian.org/debian/ testing  main > /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
-          apt-get install --no-install-recommends -qq -y git git-lfs
-          rm /etc/apt/sources.list.d/testing.list
-          apt-get update -qq
+        uses: ./.forgejo/workflows/composite/apt-install-from
+        with:
+          packages: git git-lfs
       - uses: ./.forgejo/workflows/composite/build-backend
       - run: |
           su forgejo -c 'make test-sqlite-migration test-sqlite'