From d157f626ceac955d422f8ae4d3de9189b8515fd5 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Mon, 24 Jul 2023 20:35:24 +0200 Subject: [PATCH] tools: makefile/github actions: don't call make install target multiple times - make install must only run manually when the build environment has not been set up yet --- .github/workflows/build.yml | 1 + .github/workflows/daily-checks.yml | 2 ++ .github/workflows/daily-update-metadata.yml | 1 + .github/workflows/pull-request.yml | 1 + Makefile | 10 +++++----- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eaa540158d..42b13f30be 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,6 +27,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - run: make install - run: make awesome_lint - run: make export_markdown export_html - name: setup markdown repository SSH deploy key diff --git a/.github/workflows/daily-checks.yml b/.github/workflows/daily-checks.yml index e585dddc14..a42d22246e 100644 --- a/.github/workflows/daily-checks.yml +++ b/.github/workflows/daily-checks.yml @@ -17,10 +17,12 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - run: make install - run: make awesome_lint link-checks: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - run: make install - run: make url_check diff --git a/.github/workflows/daily-update-metadata.yml b/.github/workflows/daily-update-metadata.yml index 088c3025f3..c86810a057 100644 --- a/.github/workflows/daily-update-metadata.yml +++ b/.github/workflows/daily-update-metadata.yml @@ -17,6 +17,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - run: make install - run: make update_metadata - name: commit and push changes run: | diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml index d5e37f086c..1dc94aac93 100644 --- a/.github/workflows/pull-request.yml +++ b/.github/workflows/pull-request.yml @@ -13,5 +13,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 + - run: make install - run: make awesome_lint - run: make export_markdown diff --git a/Makefile b/Makefile index 46f9dbb701..0f278f5c0d 100644 --- a/Makefile +++ b/Makefile @@ -21,24 +21,24 @@ import: clean install hecat --config .hecat/import.yml .PHONY: update_metadata # update metadata from project repositories/API -update_metadata: install +update_metadata: source .venv/bin/activate && \ hecat --config .hecat/update-metadata.yml .PHONY: awesome_lint # check data against awesome-selfhosted guidelines -awesome_lint: install +awesome_lint: source .venv/bin/activate && \ hecat --config .hecat/awesome-lint.yml .PHONY: export_markdown # render markdown export from YAML data (https://github.com/awesome-selfhosted/awesome-selfhosted) -export_markdown: install +export_markdown: rm -rf awesome-selfhosted/ git clone https://github.com/$(MARKDOWN_REPOSITORY) source .venv/bin/activate && hecat --config .hecat/export-markdown.yml cd awesome-selfhosted && git diff --color=always .PHONY: export_html # render HTML export from YAML data (https://nodiscc.github.io/awesome-selfhosted-html-preview/) -export_html: install +export_html: rm -rf awesome-selfhosted-html-preview/ html/ git clone https://github.com/$(HTML_REPOSITORY) mkdir html && source .venv/bin/activate && hecat --config .hecat/export-html.yml @@ -62,7 +62,7 @@ push_html: cd awesome-selfhosted-html-preview/ && git push -f .PHONY: url_check # check URLs for dead links or other connection problems -url_check: install +url_check: source .venv/bin/activate && \ hecat --config .hecat/url-check.yml