From 4d74ddbac07137feb7853d3570ae13c014389ea7 Mon Sep 17 00:00:00 2001 From: Bjorn Lammers Date: Sun, 20 Oct 2024 19:47:59 +0200 Subject: [PATCH] :zap: Improves workflow runtimes --- .github/workflows/convert_svg_assets.yml | 6 ++++-- .github/workflows/generate_file_tree.yml | 15 +++++++++------ .github/workflows/generate_icons_page.yml | 13 ++++++++----- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/.github/workflows/convert_svg_assets.yml b/.github/workflows/convert_svg_assets.yml index 627027b3..923bb97b 100644 --- a/.github/workflows/convert_svg_assets.yml +++ b/.github/workflows/convert_svg_assets.yml @@ -1,10 +1,12 @@ -name: Convert SVG Assets ♻️ +name: Convert SVG Assets 🔄 on: push: branches: - main - dev + paths: + - "svg/**" workflow_dispatch: jobs: @@ -36,6 +38,6 @@ jobs: git config --global user.email "noreply@lammers.media" git config --global user.name "Dashboard Icons Bot" git add png/ webp/ - git commit -m ":recycle: Convert SVG assets to PNG and WEBP" || exit 0 + git commit -m ":counterclockwise_arrows: Convert SVG assets to PNG and WEBP" || exit 0 git pull --rebase origin ${{ github.ref_name }} git push origin HEAD:${{ github.ref_name }} diff --git a/.github/workflows/generate_file_tree.yml b/.github/workflows/generate_file_tree.yml index 91538464..3f8abb8d 100644 --- a/.github/workflows/generate_file_tree.yml +++ b/.github/workflows/generate_file_tree.yml @@ -1,14 +1,17 @@ name: Generate File Tree 🌳 on: - push: + workflow_run: + workflows: ["Convert SVG Assets 🔄"] branches: - main - dev - workflow_dispatch: + types: + - completed jobs: generate_file_tree: + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest permissions: contents: write @@ -17,7 +20,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 with: - ref: ${{ github.ref_name }} + ref: ${{ github.event.workflow_run.head_branch }} - name: Set Up Python uses: actions/setup-python@v4 @@ -25,7 +28,7 @@ jobs: python-version: "3.9" - name: Generate File Tree - run: python scripts/generate_file_tree.py ../svg ../png ../webp + run: python scripts/generate_folder_tree.py svg png webp - name: Commit and Push Changes run: | @@ -33,5 +36,5 @@ jobs: git config --global user.name "Dashboard Icons Bot" git add tree.json git commit -m ":construction_worker: Generate file tree" || exit 0 - git pull --rebase origin ${{ github.ref_name }} - git push origin HEAD:${{ github.ref_name }} + git pull --rebase origin ${{ github.event.workflow_run.head_branch }} + git push origin HEAD:${{ github.event.workflow_run.head_branch }} diff --git a/.github/workflows/generate_icons_page.yml b/.github/workflows/generate_icons_page.yml index d8b5350e..5be9a3f8 100644 --- a/.github/workflows/generate_icons_page.yml +++ b/.github/workflows/generate_icons_page.yml @@ -1,14 +1,17 @@ name: Generate Icons Page 🚀 on: - push: + workflow_run: + workflows: ["Convert SVG Assets 🔄"] branches: - main - dev - workflow_dispatch: + types: + - completed jobs: build_icons_page: + if: ${{ github.event.workflow_run.conclusion == 'success' }} runs-on: ubuntu-latest permissions: contents: write @@ -17,7 +20,7 @@ jobs: - name: Checkout Repository uses: actions/checkout@v3 with: - ref: ${{ github.ref_name }} + ref: ${{ github.event.workflow_run.head_branch }} - name: Set Up Python uses: actions/setup-python@v4 @@ -33,5 +36,5 @@ jobs: git config --global user.name "Dashboard Icons Bot" git add ICONS.md git commit -m ":construction_worker: Generate ICONS.md" || exit 0 - git pull --rebase origin ${{ github.ref_name }} - git push origin HEAD:${{ github.ref_name }} + git pull --rebase origin ${{ github.event.workflow_run.head_branch }} + git push origin HEAD:${{ github.event.workflow_run.head_branch }}