Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

master <- develop #587

Merged
merged 74 commits into from
Sep 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
74 commits
Select commit Hold shift + click to select a range
6f287b4
Bump mathjs from 13.0.3 to 13.1.0
dependabot[bot] Aug 27, 2024
62ef6ca
Merge pull request #571 from falgon/dependabot/npm_and_yarn/develop/m…
kodiakhq[bot] Aug 27, 2024
501ae87
add mermaid-cli
falgon Aug 27, 2024
64fdbda
Merge branch 'develop' of github.com:falgon/roki-web into add-mermaid…
falgon Aug 27, 2024
46770f3
Bump mathjs from 13.1.0 to 13.1.1
dependabot[bot] Aug 28, 2024
d983ffd
Merge pull request #573 from falgon/dependabot/npm_and_yarn/develop/m…
kodiakhq[bot] Aug 28, 2024
dc67422
add comments
falgon Aug 28, 2024
0e9525d
add number of thread options
falgon Aug 28, 2024
7e87508
[ci skip] Merge branch 'develop' of github.com:falgon/roki-web into a…
falgon Aug 30, 2024
7063bf7
add pr labeler
falgon Sep 2, 2024
29918ed
add synchronize for tests
falgon Sep 2, 2024
ac4df10
[ci skip] Revert "add synchronize for tests"
falgon Sep 2, 2024
fffdbbf
add empty commit for tests
falgon Sep 2, 2024
51e06df
Merge pull request #575 from falgon/ci-add-auto-pr-labeler
kodiakhq[bot] Sep 2, 2024
5dbf924
WIP test for PR Labeler
falgon Sep 2, 2024
35636e8
fix pr-labeler
falgon Sep 2, 2024
e97bb1b
add synchronize for tests
falgon Sep 2, 2024
28e1ba5
Revert "add synchronize for tests"
falgon Sep 2, 2024
0026d8f
Merge pull request #576 from falgon/test-for-pr-labeler
kodiakhq[bot] Sep 2, 2024
662058f
test for pr-labeler
falgon Sep 2, 2024
fd1491a
fix labeler
falgon Sep 2, 2024
7646b17
Merge pull request #577 from falgon/test-for-pr-labeler-2
kodiakhq[bot] Sep 2, 2024
678ef7a
test for pr-labeler
falgon Sep 2, 2024
a24a3e5
fix pr-labeler action
falgon Sep 2, 2024
1af90cf
Merge pull request #578 from falgon/test-for-pr-labeler-3
kodiakhq[bot] Sep 2, 2024
6779334
test for pr-labeler
falgon Sep 2, 2024
f76d97d
fix for pr-labeler
falgon Sep 2, 2024
b49debd
Merge pull request #579 from falgon/test-for-pr-labeler-4
kodiakhq[bot] Sep 2, 2024
1c228a4
test for pr-labeler
falgon Sep 2, 2024
8046022
fix pr-labeler action
falgon Sep 2, 2024
64e5a12
Merge pull request #580 from falgon/test-for-pr-labeler-5
kodiakhq[bot] Sep 2, 2024
f63ff0f
test for pr-labeler
falgon Sep 2, 2024
b6bcc5e
fix pr-labeler action
falgon Sep 2, 2024
bcdf26f
Merge pull request #581 from falgon/test-for-pr-labeler-6
kodiakhq[bot] Sep 2, 2024
be6ff43
test for pr-labeler
falgon Sep 2, 2024
d713141
fix pr-labeler action
falgon Sep 2, 2024
5fa3095
Merge pull request #582 from falgon/test-for-pr-labeler-7
kodiakhq[bot] Sep 2, 2024
e9c7c71
Bump sass from 1.77.8 to 1.78.0
dependabot[bot] Sep 4, 2024
12220b3
[skip ci] Merge branch 'develop' of github.com:falgon/roki-web into a…
falgon Sep 4, 2024
49f8770
Merge pull request #584 from falgon/dependabot/npm_and_yarn/develop/s…
kodiakhq[bot] Sep 4, 2024
839585e
[skip ci] Merge branch 'develop' of github.com:falgon/roki-web into a…
falgon Sep 4, 2024
696bb3b
trigger commit
falgon Sep 9, 2024
73ae627
add mermaid graph for test
falgon Sep 10, 2024
c433afb
upgrade mermaid v11.1.1
falgon Sep 10, 2024
15e2b55
fix to `RawInline`
falgon Sep 10, 2024
95b8171
refactoring
falgon Sep 10, 2024
1831656
refactor dependencies
falgon Sep 10, 2024
fca30bd
Restyled by stylish-haskell
restyled-commits Sep 10, 2024
d8e440c
Merge pull request #585 from falgon/restyled/add-mermaid-rendering
falgon Sep 10, 2024
683ce16
fix dependencies
falgon Sep 10, 2024
1dcf5c1
fix dependencies of library
falgon Sep 10, 2024
da3093b
fix dependencies of library
falgon Sep 10, 2024
83bc272
Convert restyled to github actions from the github app
falgon Sep 10, 2024
d6faca2
[skip ci] update README
falgon Sep 10, 2024
0b20e48
For trigger ci
falgon Sep 10, 2024
564609e
Merge pull request #586 from falgon/ci-restyled-github-actions
kodiakhq[bot] Sep 10, 2024
2232976
add chromium-browser for puppeteer
falgon Sep 10, 2024
2f849b1
[skip ci] Merge branch 'develop' of github.com:falgon/roki-web into a…
falgon Sep 10, 2024
1ed1c0c
add `PUPPETEER_EXECUTABLE_PATH` env var
falgon Sep 10, 2024
ea4912e
add `PUPPETEER_EXECUTABLE_PATH` to Dockerfile
falgon Sep 10, 2024
4f8c105
install chromium (not chromium-browser) by snap
falgon Sep 10, 2024
76bb34f
use chromium (not chromium-browser) in Dockerfile
falgon Sep 10, 2024
40cd291
fix indent
falgon Sep 10, 2024
71950e5
add centering to mermaid svg
falgon Sep 11, 2024
7946e41
Update src/Media/SVG.hs
falgon Sep 11, 2024
d7585d2
Update .github/workflows/build_pr.yml
falgon Sep 11, 2024
b88387e
Update .github/workflows/build.yml
falgon Sep 11, 2024
a5ede56
support caption for mermaid SVG
falgon Sep 11, 2024
4056f0e
add caption test
falgon Sep 11, 2024
0c275ed
resolve conflicts
falgon Sep 11, 2024
d20a365
fix md and comment
falgon Sep 11, 2024
d87fc5a
fix caption order
falgon Sep 11, 2024
c1badde
remove extra mermaid
falgon Sep 11, 2024
d67cc47
Merge pull request #572 from falgon/add-mermaid-rendering
kodiakhq[bot] Sep 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
style:
- changed-files:
- any-glob-to-any-file: 'contents/scss/**'

CI:
- all:
- changed-files:
- any-glob-to-any-file: '.github/**'
- all-globs-to-all-files: '!.github/ISSUE_TEMPLATE/**'

documentation:
- changed-files:
- any-glob-to-any-file:
- '**/*.md'
- '**/*.markdown'

docker:
- changed-files:
- any-glob-to-any-file: 'docker/**'

pages:
- changed-files:
- any-glob-to-any-file: 'contents/pages/**'
19 changes: 17 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,24 @@ jobs:
with:
path: ~/.stack
key: stack-v2-${{ runner.os }}-${{ hashFiles('stack.yaml') }}-${{ hashFiles('stack.yaml.lock') }}-${{ hashFiles('package.yaml') }}-${{ hashFiles('docker/.env') }}
- name: Install tools
- name: Install tools (apt)
uses: awalsh128/cache-apt-pkgs-action@v1.4.2
with:
packages: libxml2-utils
version: 1.0
- name: snap cache
uses: actions/cache@v2
env:
cache-name: cache-snap-packages
with:
path: ~/snap
key: ${{ runner.os }}-snap-${{ env.cache-name }}-${{ hashFiles('**/snap-packages.txt') }}
restore-keys: |
${{ runner.os }}-snap-${{ env.cache-name }}-
${{ runner.os }}-snap-
${{ runner.os }}-
- name: Install tools (snap)
run: sudo snap install chromium
- name: Setup Stack
if: steps.site-gen-cache.outputs.cache-hit != 'true' && steps.stack-cache.outputs.cache-hit != 'true'
run: |
Expand All @@ -64,7 +77,9 @@ jobs:
with:
node-version-file: '.nvmrc'
- name: Export values
run: echo "ROKI_WEB_GH_ACTIONS_NODE_VERSION=$(node --version)" >> "$GITHUB_ENV"
run: |
echo "ROKI_WEB_GH_ACTIONS_NODE_VERSION=$(node --version)" >> "$GITHUB_ENV"
echo "PUPPETEER_EXECUTABLE_PATH=$(which chromium)" >> "$GITHUB_ENV"
- name: Node module cache
uses: actions/cache@v4
id: node-cache
Expand Down
19 changes: 17 additions & 2 deletions .github/workflows/build_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,24 @@ jobs:
ghc-version: ${{ env.ghc_version }}
enable-stack: true
stack-version: ${{ env.stack_version }}
- name: Install tools
- name: Install tools (apt)
uses: awalsh128/cache-apt-pkgs-action@v1.4.2
with:
packages: libxml2-utils parallel
version: 1.0
- name: snap cache
uses: actions/cache@v2
env:
cache-name: cache-snap-packages
with:
path: ~/snap
key: ${{ runner.os }}-snap-${{ env.cache-name }}-${{ hashFiles('**/snap-packages.txt') }}
restore-keys: |
${{ runner.os }}-snap-${{ env.cache-name }}-
${{ runner.os }}-snap-
${{ runner.os }}-
- name: Install tools (snap)
run: sudo snap install chromium
- name: Setup Stack
if: steps.site-gen-cache.outputs.cache-hit != 'true' && steps.stack-cache.outputs.cache-hit != 'true'
run: |
Expand All @@ -68,7 +81,9 @@ jobs:
with:
node-version-file: '.nvmrc'
- name: Export values
run: echo "ROKI_WEB_GH_ACTIONS_NODE_VERSION=$(node --version)" >> "$GITHUB_ENV"
run: |
echo "ROKI_WEB_GH_ACTIONS_NODE_VERSION=$(node --version)" >> "$GITHUB_ENV"
echo "PUPPETEER_EXECUTABLE_PATH=$(which chromium)" >> "$GITHUB_ENV"
- name: Node module cache
uses: actions/cache@v4
id: node-cache
Expand Down
20 changes: 20 additions & 0 deletions .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: CI-pr-label
on:
pull_request_target:
types:
- opened
jobs:
label:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
timeout-minutes: 5
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Labeling
uses: actions/labeler@v5
with:
configuration-path: .github/pr-labeler.yml
sync-labels: true
36 changes: 36 additions & 0 deletions .github/workflows/restyled.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: CI-Restyled

on:
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
restyled:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}

- uses: restyled-io/actions/setup@v4
- id: restyler
uses: restyled-io/actions/run@v4
with:
fail-on-differences: true

- if: |
!cancelled() &&
steps.restyler.outputs.success == 'true' &&
github.event.pull_request.head.repo.full_name == github.repository
uses: peter-evans/create-pull-request@v6
with:
base: ${{ steps.restyler.outputs.restyled-base }}
branch: ${{ steps.restyler.outputs.restyled-head }}
title: ${{ steps.restyler.outputs.restyled-title }}
body: ${{ steps.restyler.outputs.restyled-body }}
labels: "restyled"
reviewers: ${{ github.event.pull_request.user.login }}
delete-branch: true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

| CI | Deployment | Inspection | Quality | PR check | Docs |
| :--: | :--: | :--: | :--: | :--: | :--: |
| [![CI-push](https://github.com/falgon/roki-web/actions/workflows/build.yml/badge.svg)](https://github.com/falgon/roki-web/actions/workflows/build.yml) | [![pages-build-deployment](https://github.com/falgon/roki-web/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/falgon/roki-web/actions/workflows/pages/pages-build-deployment) [![CircleCI](https://dl.circleci.com/status-badge/img/gh/falgon/roki-web/tree/develop.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/gh/falgon/roki-web/tree/develop) | [![Known Vulnerabilities](https://snyk.io/test/github/falgon/roki-web/badge.svg?targetFile=package.json)](https://snyk.io/test/github/falgon/roki-web?targetFile=package.json) [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgit.luolix.top%2Ffalgon%2Froki-web.svg?type=shield)](https://app.fossa.com/projects/git%2Bgit.luolix.top%2Ffalgon%2Froki-web?ref=badge_shield) | [![CodeFactor](https://www.codefactor.io/repository/github/falgon/roki-web/badge?s=e4b1f45b3bb2dc89c42f654d991238ef7771bc9f)](https://www.codefactor.io/repository/github/falgon/roki-web) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/0f3e0d5c5bbe43a78eaeed7485b72c7f)](https://www.codacy.com?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=falgon/roki-web&amp;utm_campaign=Badge_Grade) [![Maintainability](https://api.codeclimate.com/v1/badges/e6574c3042df63bf6d41/maintainability)](https://codeclimate.com/github/falgon/roki-web/maintainability) | [![CircleCI](https://dl.circleci.com/status-badge/img/gh/falgon/roki-web/tree/develop.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/falgon/roki-web/tree/develop)[![CI-pr](https://github.com/falgon/roki-web/actions/workflows/build_pr.yml/badge.svg?branch=develop)](https://github.com/falgon/roki-web/actions/workflows/build_pr.yml) | [![manually-haddock](https://github.com/falgon/roki-web/actions/workflows/haddock.yml/badge.svg?branch=master)](https://github.com/falgon/roki-web/actions/workflows/haddock.yml) |
| [![CI-push](https://github.com/falgon/roki-web/actions/workflows/build.yml/badge.svg)](https://github.com/falgon/roki-web/actions/workflows/build.yml) | [![pages-build-deployment](https://github.com/falgon/roki-web/actions/workflows/pages/pages-build-deployment/badge.svg)](https://github.com/falgon/roki-web/actions/workflows/pages/pages-build-deployment) [![CircleCI](https://dl.circleci.com/status-badge/img/gh/falgon/roki-web/tree/develop.svg?style=shield)](https://dl.circleci.com/status-badge/redirect/gh/falgon/roki-web/tree/develop) | [![Known Vulnerabilities](https://snyk.io/test/github/falgon/roki-web/badge.svg?targetFile=package.json)](https://snyk.io/test/github/falgon/roki-web?targetFile=package.json) [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgit.luolix.top%2Ffalgon%2Froki-web.svg?type=shield)](https://app.fossa.com/projects/git%2Bgit.luolix.top%2Ffalgon%2Froki-web?ref=badge_shield) | [![CodeFactor](https://www.codefactor.io/repository/github/falgon/roki-web/badge?s=e4b1f45b3bb2dc89c42f654d991238ef7771bc9f)](https://www.codefactor.io/repository/github/falgon/roki-web) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/0f3e0d5c5bbe43a78eaeed7485b72c7f)](https://www.codacy.com?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=falgon/roki-web&amp;utm_campaign=Badge_Grade) [![Maintainability](https://api.codeclimate.com/v1/badges/e6574c3042df63bf6d41/maintainability)](https://codeclimate.com/github/falgon/roki-web/maintainability) [![CI-Restyled](https://github.com/falgon/roki-web/actions/workflows/restyled.yml/badge.svg)](https://github.com/falgon/roki-web/actions/workflows/restyled.yml) | [![CircleCI](https://dl.circleci.com/status-badge/img/gh/falgon/roki-web/tree/develop.svg?style=svg)](https://dl.circleci.com/status-badge/redirect/gh/falgon/roki-web/tree/develop)[![CI-pr](https://github.com/falgon/roki-web/actions/workflows/build_pr.yml/badge.svg?branch=develop)](https://github.com/falgon/roki-web/actions/workflows/build_pr.yml) | [![manually-haddock](https://github.com/falgon/roki-web/actions/workflows/haddock.yml/badge.svg?branch=master)](https://github.com/falgon/roki-web/actions/workflows/haddock.yml) |

* **Website**: [roki.dev](https://roki.dev)
* Tech blog: [roki.dev/roki.log](https://roki.dev/roki.log/)
Expand Down
2 changes: 2 additions & 0 deletions docker/contents/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ RUN sed -i 's@archive.ubuntu.com@ftp.jaist.ac.jp/pub/Linux@g' /etc/apt/sources.l
&& apt-get -y -o=Dpkg::Use-Pty=0 -qq install --no-install-recommends \
curl \
ca-certificates \
chromium \
language-pack-ja \
build-essential \
libffi-dev \
Expand All @@ -34,6 +35,7 @@ ENV LANG=ja_JP.UTF-8 \
COPY . /opt/src
WORKDIR /opt/src
RUN export BOOTSTRAP_HASKELL_GHC_VERSION="$(yq '.compiler' ./stack.yaml | cut -f2 -d-)" \
export PUPPETEER_EXECUTABLE_PATH="$(which chromium)" \
&& curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh
RUN source "$HOME/.ghcup/env" \
&& stack config set install-ghc false --global \
Expand Down
2 changes: 2 additions & 0 deletions docker/dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ RUN sed -i 's@archive.ubuntu.com@ftp.jaist.ac.jp/pub/Linux@g' /etc/apt/sources.l
build-essential \
curl \
ca-certificates \
chromium \
language-pack-ja \
libtinfo-dev \
git \
Expand Down Expand Up @@ -39,6 +40,7 @@ ENV LANG=ja_JP.UTF-8 \
BOOTSTRAP_HASKELL_NONINTERACTIVE=1
COPY --chown=rw-dev:rw-dev . /home/rw-dev/src
WORKDIR /home/rw-dev/src
ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
RUN curl -sSo- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.0/install.sh | bash \
&& export NVM_DIR="${HOME}/.nvm" \
&& [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" || true \
Expand Down
Loading
Loading