From 8b0900248d2266a468f824f33d6896c6ceeffa15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kirill=20M=C3=BCller?= Date: Mon, 5 Aug 2024 22:42:43 +0200 Subject: [PATCH] ci: Inline action --- .github/workflows/get-extra/action.yml | 16 ---------------- .github/workflows/install/action.yml | 6 +++++- 2 files changed, 5 insertions(+), 17 deletions(-) delete mode 100644 .github/workflows/get-extra/action.yml diff --git a/.github/workflows/get-extra/action.yml b/.github/workflows/get-extra/action.yml deleted file mode 100644 index 84c56d9..0000000 --- a/.github/workflows/get-extra/action.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: "Action to determine extra packages to be installed" -outputs: - packages: - description: "List of extra packages" - value: ${{ steps.get-extra.outputs.packages }} - -runs: - using: "composite" - steps: - - name: Get extra packages - id: get-extra - run: | - set -x - packages=$( ( grep Config/gha/extra-packages DESCRIPTION || true ) | cut -d " " -f 2) - echo packages=$packages >> $GITHUB_OUTPUT - shell: bash diff --git a/.github/workflows/install/action.yml b/.github/workflows/install/action.yml index cf9eda0..702aeda 100644 --- a/.github/workflows/install/action.yml +++ b/.github/workflows/install/action.yml @@ -82,7 +82,11 @@ runs: use-public-rspm: true - id: get-extra - uses: ./.github/workflows/get-extra + run: | + set -x + packages=$( ( grep Config/gha/extra-packages DESCRIPTION || true ) | cut -d " " -f 2) + echo packages=$packages >> $GITHUB_OUTPUT + shell: bash - uses: r-lib/actions/setup-r-dependencies@v2 env: