Merge remote-tracking branch 'upstream/main' into terra
This commit is contained in:
commit
776fe9fb2f
2
.github/workflows/check.yml
vendored
2
.github/workflows/check.yml
vendored
@ -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
2
.github/workflows/mdbook_docs.yml
vendored
@ -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
4
.github/workflows/release.yml
vendored
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user