From 7aa230fa7d4a5abf65aa91ca71457e6e36acb212 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Thu, 31 Aug 2023 10:11:59 +0200 Subject: [PATCH] pipeline: moved to an install dependencies script [skip ci] --- .github/workflows/cooker-selfhosted.yml | 6 ++---- .github/workflows/main-selfhosted.yml | 6 ++---- automation_tools/install_dependencies.sh | 3 +++ automation_tools/requirements.txt | 1 - 4 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 automation_tools/install_dependencies.sh delete mode 100644 automation_tools/requirements.txt diff --git a/.github/workflows/cooker-selfhosted.yml b/.github/workflows/cooker-selfhosted.yml index d1164f44..f106340a 100644 --- a/.github/workflows/cooker-selfhosted.yml +++ b/.github/workflows/cooker-selfhosted.yml @@ -48,10 +48,8 @@ jobs: echo "buildid=$result" >> $GITHUB_ENV echo "VersionID is $result" - - name: Initialize Flatpak environment - run: | - sudo apt install -y $(cat 'automation_tools/requirements.txt') - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + - name: "Install dependencies" + run: "automation_tools/install_dependencies.sh" - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" diff --git a/.github/workflows/main-selfhosted.yml b/.github/workflows/main-selfhosted.yml index cdcbc094..41792fa6 100644 --- a/.github/workflows/main-selfhosted.yml +++ b/.github/workflows/main-selfhosted.yml @@ -37,10 +37,8 @@ jobs: with: submodules: 'true' - - name: Initialize Flatpak environment - run: | - sudo apt install -y $(cat 'automation_tools/requirements.txt') - flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo + - name: "Install dependencies" + run: "automation_tools/install_dependencies.sh" - name: Run pre-build automation tasks run : "/bin/bash ${GITHUB_WORKSPACE}/automation_tools/pre_build_automation.sh" diff --git a/automation_tools/install_dependencies.sh b/automation_tools/install_dependencies.sh new file mode 100644 index 00000000..1f9ce4d9 --- /dev/null +++ b/automation_tools/install_dependencies.sh @@ -0,0 +1,3 @@ +#!/bin/bash +sudo apt install -y flatpak flatpak-builder p7zip-full xmlstarlet bzip2 curl +flatpak remote-add --user --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo \ No newline at end of file diff --git a/automation_tools/requirements.txt b/automation_tools/requirements.txt deleted file mode 100644 index 3dac54e4..00000000 --- a/automation_tools/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -flatpak flatpak-builder p7zip-full xmlstarlet bzip2 curl \ No newline at end of file