summaryrefslogtreecommitdiff
path: root/.github
diff options
context:
space:
mode:
authorLuke Smith <luke@lukesmith.xyz>2021-03-12 10:58:50 -0500
committerLuke Smith <luke@lukesmith.xyz>2021-03-12 10:58:50 -0500
commit07c7f958cf87b44b28a82463b1fe6c88433a6050 (patch)
treeb26661c92c16d54bdec32fcec27acc2200a8bd18 /.github
parent0bcb5dc3150a4f91245687a858b25493be38fe49 (diff)
parenteb617ebc5bbe1d7ec4f50d65b056fd8f3f93ed3f (diff)
Merge branch 'master' of github.com:LukeSmithxyz/based.cooking
Diffstat (limited to '.github')
-rw-r--r--.github/workflows/upload.yml6
1 files changed, 1 insertions, 5 deletions
diff --git a/.github/workflows/upload.yml b/.github/workflows/upload.yml
index a781e70..b9174e3 100644
--- a/.github/workflows/upload.yml
+++ b/.github/workflows/upload.yml
@@ -1,14 +1,10 @@
-# This is a basic workflow to help you get started with Actions
-
name: CI
# Controls when the action will run.
on:
- # Triggers the workflow on push or pull request events but only for the master branch
+ # Triggers the workflow on push to master (including merged PRs)
push:
branches: [ master ]
- pull_request:
- branches: [ master ]
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch: