dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/main' into terra

Browse Source
This commit is contained in:
dusk 2021-10-23 12:07:00 +03:00
commit 776fe9fb2f
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/check.yml vendored
View File

@ -2,7 +2,7 @@ name: "Check & Cachix"
on: on:
push: push:
branches: branches:
- master - main
- trying - trying
- staging - staging
jobs: jobs:

2
.github/workflows/mdbook_docs.yml vendored
View File

@ -3,7 +3,7 @@ name: Deploy Docs to GitHub Pages
on: on:
push: push:
branches: branches:
- master - main
jobs: jobs:
deploy: deploy:

4
.github/workflows/release.yml vendored
View File

@ -19,7 +19,7 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
ref: master ref: main
- name: Update Changelog - name: Update Changelog
uses: heinrichreimer/github-changelog-generator-action@v2.1.1 uses: heinrichreimer/github-changelog-generator-action@v2.1.1
with: with:
@ -49,7 +49,7 @@ jobs:
- name: Checkout code - name: Checkout code
uses: actions/checkout@v2 uses: actions/checkout@v2
with: with:
ref: master ref: main
- name: Get Changelog Entry - name: Get Changelog Entry
id: changelog_reader id: changelog_reader