Skip to content

Commit

Permalink
CI: master -> main
Browse files Browse the repository at this point in the history
Some of these were missed when the default branch was renamed to main,
and as such, not all CI checks have been running since then.
  • Loading branch information
ThomasAdam committed Jul 6, 2023
1 parent 18c93b7 commit cbd038d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html

- [https://raw.githubusercontent.com/fvwmorg/fvwm3/master/doc/README]Documentation updated (where appropriate)
- [https://raw.githubusercontent.com/fvwmorg/fvwm3/main/doc/README]Documentation updated (where appropriate)

- Style guide followed (try and match the surrounding code where possible)

Expand All @@ -32,4 +32,4 @@ If there is more than one issue fixed then use:

```
Fixes #XXX, fixes #YYY, fixes #ZZZ
```
```
6 changes: 3 additions & 3 deletions .github/workflows/ccpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: FVWM3 CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main
jobs:
build:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -39,4 +39,4 @@ jobs:
notice: false
channel: "#fvwm"
nickname: fvwm-gh
message: ${{ github.actor }} tagged ${{ github.repository }} ${{ github.event.ref }}
message: ${{ github.actor }} tagged ${{ github.repository }} ${{ github.event.ref }}
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
-H "X-GitHub-Api-Version: 2022-11-28" \
https://api.github.com/repos/fvwmorg/fvwm3/releases/generate-notes \
-d '{"tag_name":"${{ github.event.inputs.versionRelease }}","target_commitish":"master","configuration_file_path":".github/release.yml"}' | \
-d '{"tag_name":"${{ github.event.inputs.versionRelease }}","target_commitish":"main","configuration_file_path":".github/release.yml"}' | \
jq -r '.body' >> ./tmp.out
sed -i '2d' ./tmp.out
sed -i "2r tmp.out" CHANGELOG.md
Expand All @@ -47,10 +47,10 @@ jobs:
with:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
head: release/${{ github.event.inputs.versionRelease }}
base: master
base: main
title: release ${{ github.event.inputs.versionRelease }}
reviewers: ${{ github.event.issue.user.login }}
body: |
Hello,
This PR was created in response to a release workflow running.
I've updated the version name and code commit: ${{ steps.make-commit.outputs.commit }}.
I've updated the version name and code commit: ${{ steps.make-commit.outputs.commit }}.

0 comments on commit cbd038d

Please sign in to comment.