diff --git a/.github/workflows/benchmarks.yaml b/.github/workflows/benchmarks.yaml index c6a482ddb4..fc7e8de050 100644 --- a/.github/workflows/benchmarks.yaml +++ b/.github/workflows/benchmarks.yaml @@ -24,10 +24,16 @@ jobs: persist-credentials: false - name: Check for file changes id: changes - run: | + run: | # zizmor: ignore[template-injection] These SHAs are generated by GitHub, not user-controlled. set -e - BEFORE_SHA="${{ github.event.before }}" - CURRENT_SHA="${{ github.event.after }}" + # merge_group events use different context properties than push events + if [ -n "${{ github.event.merge_group.base_sha }}" ]; then + BEFORE_SHA="${{ github.event.merge_group.base_sha }}" + CURRENT_SHA="${{ github.event.merge_group.head_sha }}" + else + BEFORE_SHA="${{ github.event.before }}" + CURRENT_SHA="${{ github.event.after }}" + fi # Default to running all checks echo "go=true" >> $GITHUB_OUTPUT diff --git a/.github/workflows/pull-request.yaml b/.github/workflows/pull-request.yaml index b2faf83524..39090bb880 100644 --- a/.github/workflows/pull-request.yaml +++ b/.github/workflows/pull-request.yaml @@ -1,6 +1,6 @@ name: PR Check -on: [pull_request] +on: [ pull_request, merge_group ] # When a new revision is pushed to a PR, cancel all in-progress CI runs for that # PR. See https://docs.github.com/en/actions/using-jobs/using-concurrency @@ -10,6 +10,7 @@ concurrency: permissions: contents: read + security-events: write jobs: # Check what types of changes this PR contains @@ -26,6 +27,7 @@ jobs: - name: Check out repository code uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2 with: + fetch-depth: 0 persist-credentials: false - name: Download OPA @@ -35,7 +37,7 @@ jobs: - name: Check for file changes id: changes - run: | + run: | # zizmor: ignore[template-injection] These SHAs are generated by GitHub, not user-controlled. set -e # Default to running all checks @@ -45,7 +47,11 @@ jobs: echo "rego=true" >> $GITHUB_OUTPUT echo "yaml=true" >> $GITHUB_OUTPUT - if ! curl -s -o changed_files.json -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ + # Get changed files: use git diff for merge_group, PR API for pull_request + if [ -n "${{ github.event.merge_group.base_sha }}" ]; then + git diff --name-only "${{ github.event.merge_group.base_sha }}" "${{ github.event.merge_group.head_sha }}" \ + | jq -R '{filename: .}' | jq -s '.' > changed_files.json + elif ! curl -s -o changed_files.json -H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \ "https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/files"; then echo "Error: Failed to fetch changed files from GitHub API" echo "Defaulting to running all checks (go=true, wasm=true, docs=true, rego=true, yaml=true)" diff --git a/README.md b/README.md index b6a46027a1..2bca946b9f 100644 --- a/README.md +++ b/README.md @@ -79,6 +79,11 @@ and more, see [openpolicyagent.org](https://www.openpolicyagent.org). ## Presentations +- Open Policy Agent (OPA) Intro & Deep Dive @ Kubecon EU 2026: [video](https://www.youtube.com/watch?v=TENlj4r6IXk) +- Open Policy Agent (OPA) Intro & Deep Dive @ Kubecon NA 2025: [video](https://www.youtube.com/watch?v=tDBYMF2XXLA) +- Open Policy Agent (OPA) Intro & Deep Dive @ Kubecon EU 2025: [video](https://www.youtube.com/watch?v=XtA-NKoJDaI) +- Open Policy Agent (OPA) Intro & Deep Dive @ Kubecon NA 2024: [video](https://www.youtube.com/watch?v=QuotLxFb2f4) +- Open Policy Agent (OPA) Intro & Deep Dive @ Kubecon EU 2024: [video](https://www.youtube.com/watch?v=hENwFyrtm1g) - Open Policy Agent (OPA) Intro & Deep Dive @ Kubecon NA 2023: [video](https://www.youtube.com/watch?v=wJkjsvVpj_Q) - Open Policy Agent (OPA) Intro & Deep Dive @ Kubecon EU 2023: [video](https://www.youtube.com/watch?v=6RNp3m_THw4) - Running Policy in Hard to Reach Places with WASM & OPA @ CN Wasm Day EU 2023: [video](https://www.youtube.com/watch?v=BdeBhukLwt4)