Skip to content

Commit

Permalink
Revert extraction of reusable workflow for tool installation
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
homeworkprod committed Jan 12, 2025
1 parent 4675a1f commit d3df44a
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 38 deletions.
13 changes: 10 additions & 3 deletions .github/workflows/build-data-archive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@ on:
workflow_dispatch:

jobs:
install-tools:
uses: ./.github/workflows/install-tools.yml

build:
# Grant `GITHUB_TOKEN` the necessary permissions.
permissions:
Expand All @@ -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

Expand Down
32 changes: 0 additions & 32 deletions .github/workflows/install-tools.yml

This file was deleted.

26 changes: 23 additions & 3 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,41 @@ on:
workflow_dispatch:

jobs:
install-tools:
uses: ./.github/workflows/install-tools.yml

build:
runs-on: ubuntu-latest

steps:
- 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

0 comments on commit d3df44a

Please sign in to comment.