From 3902e6399930481f2d1e1f5bc171f609955336dc Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun, 1 Oct 2023 01:38:49 -0700 Subject: [PATCH] Squashed commit of the following: commit 3b370925a2cf9043c7dbb900e1178bfa82f0ecc5 Author: shamoon <4887959+shamoon@users.noreply.github.com> Date: Sun Oct 1 01:36:08 2023 -0700 use native path filtering for ci --- .github/workflows/docker-publish.yml | 33 ++++++---------------------- .github/workflows/docs-publish.yml | 30 +++++++------------------ 2 files changed, 15 insertions(+), 48 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index db303d21..7f317ef6 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -12,8 +12,14 @@ on: branches: [ "main" ] # Publish semver tags as releases. tags: [ 'v*.*.*' ] + paths-ignore: + - 'docs/**' + - 'mkdocs.yml' pull_request: branches: [ "main" ] + paths-ignore: + - 'docs/**' + - 'mkdocs.yml' env: # Use docker.io for Docker Hub if empty @@ -23,34 +29,9 @@ env: jobs: - changes: - name: Detect Changes - runs-on: ubuntu-latest - # Required permissions - permissions: - pull-requests: read - # Set job outputs to values from filter step - outputs: - src: ${{ steps.filter.outputs.src }} - steps: - - uses: actions/checkout@v4 - - uses: dorny/paths-filter@v2 - id: filter - with: - filters: | - src: - - 'src/**' - - 'Dockerfile' - - 'docker-entrypoint.sh' - - 'package.json' - - 'package-lock.json' - - 'pnpm-lock.yaml' - - 'tailwind.config.js' - - 'postcss.config.js' build: name: Docker Build & Push - needs: changes - if: needs.changes.outputs.src == 'true' && github.repository == 'benphelps/homepage' + if: github.repository == 'benphelps/homepage' runs-on: self-hosted permissions: contents: read diff --git a/.github/workflows/docs-publish.yml b/.github/workflows/docs-publish.yml index 3dde6481..bd14f9aa 100644 --- a/.github/workflows/docs-publish.yml +++ b/.github/workflows/docs-publish.yml @@ -4,35 +4,22 @@ on: push: tags: [ 'v*.*.*' ] branches: ['main'] + paths: + - 'docs/**' + - 'mkdocs.yml' pull_request: + paths: + - 'docs/**' + - 'mkdocs.yml' workflow_dispatch: permissions: contents: write jobs: - changes: - name: Detect Changes - runs-on: ubuntu-latest - # Required permissions - permissions: - pull-requests: read - # Set job outputs to values from filter step - outputs: - docs: ${{ steps.filter.outputs.docs }} - steps: - - uses: actions/checkout@v4 - - uses: dorny/paths-filter@v2 - id: filter - with: - filters: | - docs: - - 'docs/**' - - 'mkdocs.yml' test: - needs: changes name: Test Build - if: needs.changes.outputs.docs == 'true' && github.repository == 'benphelps/homepage' && github.event_name == 'pull_request' + if: github.repository == 'benphelps/homepage' && github.event_name == 'pull_request' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -52,9 +39,8 @@ jobs: - name: Test Docs Build run: MKINSIDERS=false mkdocs build deploy: - needs: changes name: Build & Deploy - if: needs.changes.outputs.docs == 'true' && github.repository == 'benphelps/homepage' && github.event_name != 'pull_request' + if: github.repository == 'benphelps/homepage' && github.event_name != 'pull_request' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4