Merge branch 'main' into fmt

daac-tools · Nov 9, 2023 · 763d2dd · 763d2dd
2 parents bf53afd + c0478b8
commit 763d2dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -1,18 +1,15 @@
 on:
   push:
     branches: [ main ]
-  pull_request_target:
-    types: [ labeled ]
+  pull_request:
+    branches: [ main ]
 
 name: deploy
 
 jobs:
   publish:
     name: Publish to Cloudflare Pages
     runs-on: ubuntu-latest
-    if: |
-      (github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'ok to test')) ||
-      (github.event_name != 'pull_request_target')
     permissions:
       contents: read
       deployments: write
@@ -47,7 +44,6 @@ jobs:
         projectName: vaporetto-demo
         directory: ./examples/wasm/dist
         gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-        branch: ${GITHUB_REF##*/}
 
     - name: Add publish URL as commit status
       uses: actions/github-script@v6

diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -3,8 +3,8 @@ on:
     - cron: '0 0 * * *'
   push:
     branches: [ main ]
-  pull_request_target:
-    types: [ labeled ]
+  pull_request:
+    branches: [ main ]
 
 name: build
 
@@ -15,9 +15,6 @@ jobs:
   build:
     name: Check on ${{ matrix.rust }}
     runs-on: ubuntu-latest
-    if: |
-      (github.event_name == 'pull_request_target' && contains(github.event.pull_request.labels.*.name, 'ok to test')) ||
-      (github.event_name != 'pull_request_target')
     strategy:
       matrix:
         rust: