From d3df44aa77305eddeae1a6d7883af4fc1b0bddf9 Mon Sep 17 00:00:00 2001
From: Jochen Kupperschmidt <homework@nwsnet.de>
Date: Sun, 12 Jan 2025 01:32:42 +0100
Subject: [PATCH] Revert extraction of reusable workflow for tool installation

The tools are not available to the calling workflows.

Build artifacts are an option, but not sure how to get them right in the case of Python.
---
 .github/workflows/build-data-archive.yml | 13 +++++++---
 .github/workflows/install-tools.yml      | 32 ------------------------
 .github/workflows/validate.yml           | 26 ++++++++++++++++---
 3 files changed, 33 insertions(+), 38 deletions(-)
 delete mode 100644 .github/workflows/install-tools.yml

diff --git a/.github/workflows/build-data-archive.yml b/.github/workflows/build-data-archive.yml
index 8804c8f..2379bcc 100644
--- a/.github/workflows/build-data-archive.yml
+++ b/.github/workflows/build-data-archive.yml
@@ -12,9 +12,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  install-tools:
-    uses: ./.github/workflows/install-tools.yml
-
   build:
     # Grant `GITHUB_TOKEN` the necessary permissions.
     permissions:
@@ -26,6 +23,16 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
+      - name: Install just
+        run: |
+          wget -q -O - 'https://github.com/casey/just/releases/download/1.38.0/just-1.38.0-x86_64-unknown-linux-musl.tar.gz' | tar xvz just --to-stdout > /usr/local/bin/just
+          chmod u+x /usr/local/bin/just
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
       - name: Fetch contributors
         run: just fetch-contributors
 
diff --git a/.github/workflows/install-tools.yml b/.github/workflows/install-tools.yml
deleted file mode 100644
index e60d486..0000000
--- a/.github/workflows/install-tools.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-name: Install tools
-
-on:
-  workflow_call:
-
-jobs:
-  install-tools:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Install just
-        run: |
-          wget -q -O - 'https://github.com/casey/just/releases/download/1.38.0/just-1.38.0-x86_64-unknown-linux-musl.tar.gz' | tar xvz just --to-stdout > /usr/local/bin/just
-          chmod u+x /usr/local/bin/just
-
-      - name: Set up Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.12"
-
-      - name: Setup cache for Taplo CLI executable
-        id: cache-taplo
-        uses: actions/cache@v4
-        with:
-          path: /usr/local/bin/taplo
-          key: taplo-0.9.3
-
-      - name: Install Taplo CLI
-        if: steps.cache-taplo.outputs.cache-hit != 'true'
-        run: |
-          wget -q -O - 'https://github.com/tamasfe/taplo/releases/download/0.9.3/taplo-linux-x86_64.gz' | gunzip -c > /usr/local/bin/taplo
-          chmod u+x /usr/local/bin/taplo
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 753f125..4e2bc51 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -10,9 +10,6 @@ on:
   workflow_dispatch:
 
 jobs:
-  install-tools:
-    uses: ./.github/workflows/install-tools.yml
-
   build:
     runs-on: ubuntu-latest
 
@@ -20,11 +17,34 @@ jobs:
       - name: Check out repository
         uses: actions/checkout@v4
 
+      - name: Install just
+        run: |
+          wget -q -O - 'https://github.com/casey/just/releases/download/1.38.0/just-1.38.0-x86_64-unknown-linux-musl.tar.gz' | tar xvz just --to-stdout > /usr/local/bin/just
+          chmod u+x /usr/local/bin/just
+
+      - name: Setup cache for Taplo CLI executable
+        id: cache-taplo
+        uses: actions/cache@v4
+        with:
+          path: /usr/local/bin/taplo
+          key: taplo-0.9.3
+
+      - name: Install Taplo CLI
+        if: steps.cache-taplo.outputs.cache-hit != 'true'
+        run: |
+          wget -q -O - 'https://github.com/tamasfe/taplo/releases/download/0.9.3/taplo-linux-x86_64.gz' | gunzip -c > /usr/local/bin/taplo
+          chmod u+x /usr/local/bin/taplo
+
       - name: Validate party series TOML file
         run: just validate-series
 
       - name: Validate party TOML files
         run: just validate-parties
 
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
       - name: Ensure that parties are in the past
         run: just validate-party-dates