Skip to content

Commit

Permalink
Merge branch 'yshui:next' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
pijulius authored Jul 31, 2024
2 parents e489a48 + 7094d7a commit ee5e13e
Show file tree
Hide file tree
Showing 18 changed files with 1,565 additions and 189 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/coding-style-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ jobs:
steps:
- uses: actions/checkout@v4
- run: git fetch --depth=1 origin ${{ github.event.pull_request.base.sha }}
- uses: yshui/git-clang-format-lint@v1.15
- uses: yshui/git-clang-format-lint@v1.16
with:
base: ${{ github.event.pull_request.base.sha }}
2 changes: 1 addition & 1 deletion .github/workflows/coding-style.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 2
- uses: yshui/git-clang-format-lint@v1.15
- uses: yshui/git-clang-format-lint@v1.16
with:
base: ${{ github.event.ref }}~1
53 changes: 53 additions & 0 deletions .github/workflows/page.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@

name: GitHub Pages

on:
push:
pull_request:


permissions:
contents: read
pages: write
id-token: write
concurrency:
group: "pages"
cancel-in-progress: true

jobs:
build:
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
submodules: false
fetch-depth: 0

- name: Setup Pages
id: pages
uses: actions/configure-pages@v5
- name: Install asciidoctor
run: sudo apt install -y asciidoctor

- name: Build
run: |
asciidoctor -a doctype=article -a stylesheet=../assets/next.css -b html man/picom.1.adoc -D _site
asciidoctor -a doctype=article -a stylesheet=../assets/next.css -b html man/picom-inspect.1.adoc -D _site
asciidoctor -a doctype=article -a stylesheet=../assets/next.css -b html man/picom-trans.1.adoc -D _site
cp _site/picom.1.html _site/index.html
- name: Upload
uses: actions/upload-pages-artifact@v3

deploy:
if: github.ref == 'refs/heads/next'
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4

1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@
* `libconfig` is now a mandatory dependency, with a minimal supported version of 1.7.
* `xcb-dpms` is not needed anymore.
* `libXext` is not needed anymore.
* man pages are now built with asciidoctor, instead of asciidoc.

## Behind the scene changes

Expand Down
Loading

0 comments on commit ee5e13e

Please sign in to comment.