Skip to content

GHA: Update path filters to include workflow files and Makefile #23940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
r0mant merged 1 commit into from
Apr 4, 2023
Merged

GHA: Update path filters to include workflow files and Makefile #23940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/build-macos-bypass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ run-name: Skip Build on Mac OS
on:
pull_request:
paths-ignore:
- '.github/workflows/build-macos.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
Expand All @@ -22,8 +23,10 @@ on:
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
paths-ignore:
- '.github/workflows/build-macos.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
Expand All @@ -32,6 +35,7 @@ on:
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
build:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build-macos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ run-name: Build on Mac OS
on:
pull_request:
paths:
- '.github/workflows/build-macos.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
Expand All @@ -12,8 +13,10 @@ on:
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
paths:
- '.github/workflows/build-macos.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
Expand All @@ -22,6 +25,7 @@ on:
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
build:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build-windows-bypass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,24 @@ on:
# We only build tsh on Windows so only consider Go code as tsh doesn't
# run any Rust.
paths-ignore:
- '.github/workflows/build-windows.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
# We only build tsh on Windows so only consider Go code as tsh doesn't
# run any Rust.
paths-ignore:
- '.github/workflows/build-windows.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
build:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,24 @@ on:
# We only build tsh on Windows so only consider Go code as tsh doesn't
# run any Rust.
paths:
- '.github/workflows/build-windows.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
# We only build tsh on Windows so only consider Go code as tsh doesn't
# run any Rust.
paths:
- '.github/workflows/build-windows.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
build:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/integration-tests-non-root-bypass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,22 @@ run-name: Skip Integration Tests (Non-root) - ${{ github.run_id }} - @${{ github
on:
pull_request:
paths-ignore:
- '.github/workflows/integration-tests-non-root.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
paths-ignore:
- '.github/workflows/integration-tests-non-root.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
test:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/integration-tests-non-root.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,22 @@ on:
- branch/*
pull_request:
paths:
- '.github/workflows/integration-tests-non-root.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
paths:
- '.github/workflows/integration-tests-non-root.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
test:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/integration-tests-root-bypass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,22 @@ run-name: Skip Integration Tests (Root) - ${{ github.run_id }} - @${{ github.act
on:
pull_request:
paths-ignore:
- '.github/workflows/integration-tests-root.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
paths-ignore:
- '.github/workflows/integration-tests-root.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
test:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/integration-tests-root.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,22 @@ on:
- branch/*
pull_request:
paths:
- '.github/workflows/integration-tests-root.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
paths:
- '.github/workflows/integration-tests-root.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
test:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint-bypass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ on:
jobs:
lint:
name: Lint (Go)
runs-on: ubuntu-latest
runs-on: ubuntu-latest

permissions:
contents: none

steps:
- run: 'echo "No changes to verify"'
- run: 'echo "No changes to verify"'
4 changes: 4 additions & 0 deletions .github/workflows/unit-tests-code-bypass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,22 @@ run-name: Skip Unit Tests (Go) - ${{ github.run_id }} - @${{ github.actor }}
on:
pull_request:
paths-ignore:
- '.github/workflows/unit-tests-code.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
paths-ignore:
- '.github/workflows/unit-tests-code.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
test:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/unit-tests-code.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,22 @@ on:
- branch/*
pull_request:
paths:
- '.github/workflows/unit-tests-code.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
paths:
- '.github/workflows/unit-tests-code.yaml'
- '**.go'
- 'go.mod'
- 'go.sum'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
test:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/unit-tests-helm-bypass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ run-name: Skip Unit Tests (Helm) - ${{ github.run_id }} - @${{ github.actor }}
on:
pull_request:
paths-ignore:
- '.github/workflows/unit-tests-helm.yaml'
- 'examples/chart/**'
merge_group:
paths-ignore:
- '.github/workflows/unit-tests-helm.yaml'
- 'examples/chart/**'

jobs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/unit-tests-helm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ run-name: Unit Tests (Helm) - ${{ github.run_id }} - @${{ github.actor }}
on:
pull_request:
paths:
- '.github/workflows/unit-tests-helm.yaml'
- 'examples/chart/**'
merge_group:
paths:
- '.github/workflows/unit-tests-helm.yaml'
- 'examples/chart/**'

jobs:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/unit-tests-rust-bypass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,22 @@ run-name: Skip Unit Tests (Rust) - ${{ github.run_id }} - @${{ github.actor }}
on:
pull_request:
paths-ignore:
- '.github/workflows/unit-tests-rust.yaml'
- '**.rs'
- 'Cargo.toml'
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
paths-ignore:
- '.github/workflows/unit-tests-rust.yaml'
- '**.rs'
- 'Cargo.toml'
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
test:
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/unit-tests-rust.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,22 @@ run-name: Unit Tests (Rust) - ${{ github.run_id }} - @${{ github.actor }}
on:
pull_request:
paths:
- '.github/workflows/unit-tests-rust.yaml'
- '**.rs'
- 'Cargo.toml'
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'
merge_group:
paths:
- '.github/workflows/unit-tests-rust.yaml'
- '**.rs'
- 'Cargo.toml'
- 'Cargo.lock'
- 'build.assets/Makefile'
- 'build.assets/Dockerfile*'
- 'Makefile'

jobs:
test:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/unit-tests-ui-bypass.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ run-name: Unit Tests UI - ${{ github.run_id }} - @${{ github.actor }}
on:
pull_request:
paths-ignore:
- '.github/workflows/unit-tests-ui.yaml'
- 'web/**'
merge_group:
paths-ignore:
- '.github/workflows/unit-tests-ui.yaml'
- 'web/**'

jobs:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/unit-tests-ui.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@ run-name: Unit Tests UI - ${{ github.run_id }} - @${{ github.actor }}
on:
pull_request:
paths:
- '.github/workflows/unit-tests-ui.yaml'
- 'web/**'
merge_group:
paths:
- '.github/workflows/unit-tests-ui.yaml'
- 'web/**'

jobs:
Expand Down
4 changes: 2 additions & 2 deletions lib/reversetunnel/agentpool_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ func TestAgentPoolConnectionCount(t *testing.T) {
default:
return false
}
}, time.Second*1, time.Millisecond*10, "expected a lease to be available")
}, time.Second*5, time.Millisecond*10, "expected a lease to be available")

require.False(t, pool.isAgentRequired())
require.Equal(t, pool.Count(), 1)
Expand All @@ -161,7 +161,7 @@ func TestAgentPoolConnectionCount(t *testing.T) {

require.Eventually(t, func() bool {
return pool.Count() == 3
}, time.Second*1, time.Millisecond*10)
}, time.Second*5, time.Millisecond*10)

select {
case <-pool.tracker.Acquire():
Expand Down