diff options
author | pacien | 2023-02-17 22:57:38 +0100 |
---|---|---|
committer | pacien | 2023-02-17 22:57:38 +0100 |
commit | 46cd42de44e402fbf33522d999fa2649729ffaa8 (patch) | |
tree | 1281beefda5d9b6d2411bc47ec1327fbf0b38dde | |
parent | 11bbbae2850b9c45da697a8ed9626495a50a38c0 (diff) | |
parent | e939712a284dff9af6d81cc1fcd4e7f7ec9ad503 (diff) | |
download | ldgallery-46cd42de44e402fbf33522d999fa2649729ffaa8.tar.gz |
Merge branch 'develop': release v2.2v2.2
50 files changed, 1895 insertions, 879 deletions
diff --git a/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md new file mode 100644 index 0000000..7c48653 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md | |||
@@ -0,0 +1,20 @@ | |||
1 | --- | ||
2 | name: Generic pull request | ||
3 | about: Create a pull request to propose some changes. | ||
4 | title: '' | ||
5 | labels: '' | ||
6 | assignees: '' | ||
7 | --- | ||
8 | |||
9 | ### What changed | ||
10 | |||
11 | |||
12 | ### Why the changes | ||
13 | |||
14 | |||
15 | ### Before-merge checklist | ||
16 | |||
17 | - [ ] Changes are tested. | ||
18 | - [ ] Documentation is up to date with the changes. | ||
19 | - [ ] Commit history is clean and descriptive. | ||
20 | |||
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f5ca509..7387fe7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml | |||
@@ -5,8 +5,8 @@ jobs: | |||
5 | build-viewer: | 5 | build-viewer: |
6 | runs-on: ubuntu-20.04 | 6 | runs-on: ubuntu-20.04 |
7 | steps: | 7 | steps: |
8 | - uses: actions/checkout@v2 | 8 | - uses: actions/checkout@v3 |
9 | - uses: actions/setup-node@v1 | 9 | - uses: actions/setup-node@v3 |
10 | with: | 10 | with: |
11 | # Latest version officially tested for Ld | 11 | # Latest version officially tested for Ld |
12 | node-version: 16.14.2 | 12 | node-version: 16.14.2 |
@@ -16,7 +16,7 @@ jobs: | |||
16 | yarn | 16 | yarn |
17 | yarn run lint | 17 | yarn run lint |
18 | yarn run build | 18 | yarn run build |
19 | - uses: actions/upload-artifact@v2 | 19 | - uses: actions/upload-artifact@v3 |
20 | with: | 20 | with: |
21 | name: viewer-dist | 21 | name: viewer-dist |
22 | path: viewer/dist | 22 | path: viewer/dist |
@@ -30,14 +30,14 @@ jobs: | |||
30 | os: [ ubuntu-20.04, windows-2019 ] | 30 | os: [ ubuntu-20.04, windows-2019 ] |
31 | runs-on: ${{ matrix.os }} | 31 | runs-on: ${{ matrix.os }} |
32 | steps: | 32 | steps: |
33 | - uses: actions/checkout@v2 | 33 | - uses: actions/checkout@v3 |
34 | - uses: actions/cache@v2 | 34 | - uses: actions/cache@v3 |
35 | with: | 35 | with: |
36 | path: ~/.stack | 36 | path: ~/.stack |
37 | key: compiler-${{ runner.os }}-${{ hashFiles('compiler/stack.yaml') }} | 37 | key: compiler-${{ runner.os }}-${{ hashFiles('compiler/stack.yaml') }} |
38 | - uses: haskell/actions/setup@v1 | 38 | - uses: haskell/actions/setup@v2 |
39 | with: | 39 | with: |
40 | ghc-version: 8.10.4 | 40 | ghc-version: 9.2.4 |
41 | enable-stack: true | 41 | enable-stack: true |
42 | - name: Build Haskell Stack project | 42 | - name: Build Haskell Stack project |
43 | working-directory: compiler | 43 | working-directory: compiler |
@@ -49,7 +49,7 @@ jobs: | |||
49 | --flag ldgallery-compiler:portable \ | 49 | --flag ldgallery-compiler:portable \ |
50 | --copy-bins \ | 50 | --copy-bins \ |
51 | --local-bin-path dist | 51 | --local-bin-path dist |
52 | - uses: actions/upload-artifact@v2 | 52 | - uses: actions/upload-artifact@v3 |
53 | with: | 53 | with: |
54 | name: compiler-dist-${{ matrix.os }} | 54 | name: compiler-dist-${{ matrix.os }} |
55 | path: compiler/dist | 55 | path: compiler/dist |
@@ -60,14 +60,14 @@ jobs: | |||
60 | needs: [ build-viewer, build-compiler ] | 60 | needs: [ build-viewer, build-compiler ] |
61 | runs-on: ubuntu-20.04 | 61 | runs-on: ubuntu-20.04 |
62 | steps: | 62 | steps: |
63 | - uses: actions/checkout@v2 | 63 | - uses: actions/checkout@v3 |
64 | - name: Bundle ldgallery viewer | 64 | - name: Bundle ldgallery viewer |
65 | uses: actions/download-artifact@v2 | 65 | uses: actions/download-artifact@v3 |
66 | with: | 66 | with: |
67 | name: viewer-dist | 67 | name: viewer-dist |
68 | path: dist/viewer | 68 | path: dist/viewer |
69 | - name: Bundle ldgallery compiler | 69 | - name: Bundle ldgallery compiler |
70 | uses: actions/download-artifact@v2 | 70 | uses: actions/download-artifact@v3 |
71 | with: | 71 | with: |
72 | name: compiler-dist-ubuntu-20.04 | 72 | name: compiler-dist-ubuntu-20.04 |
73 | path: dist | 73 | path: dist |
@@ -82,7 +82,7 @@ jobs: | |||
82 | pandoc --standalone --to man viewer/ldgallery-viewer.7.md --output dist/ldgallery-viewer.7 | 82 | pandoc --standalone --to man viewer/ldgallery-viewer.7.md --output dist/ldgallery-viewer.7 |
83 | cp changelog.md dist/ | 83 | cp changelog.md dist/ |
84 | cp license.md dist/ | 84 | cp license.md dist/ |
85 | - uses: actions/upload-artifact@v2 | 85 | - uses: actions/upload-artifact@v3 |
86 | with: | 86 | with: |
87 | name: archive-linux-amd64 | 87 | name: archive-linux-amd64 |
88 | path: dist | 88 | path: dist |
@@ -91,18 +91,18 @@ jobs: | |||
91 | needs: [ build-viewer, build-compiler ] | 91 | needs: [ build-viewer, build-compiler ] |
92 | runs-on: ubuntu-20.04 | 92 | runs-on: ubuntu-20.04 |
93 | steps: | 93 | steps: |
94 | - uses: actions/checkout@v2 | 94 | - uses: actions/checkout@v3 |
95 | - uses: actions/cache@v2 | 95 | - uses: actions/cache@v3 |
96 | with: | 96 | with: |
97 | path: ~/downloads | 97 | path: ~/downloads |
98 | key: archive-windows-vendored | 98 | key: archive-windows-vendored |
99 | - name: Bundle ldgallery viewer | 99 | - name: Bundle ldgallery viewer |
100 | uses: actions/download-artifact@v2 | 100 | uses: actions/download-artifact@v3 |
101 | with: | 101 | with: |
102 | name: viewer-dist | 102 | name: viewer-dist |
103 | path: dist/viewer | 103 | path: dist/viewer |
104 | - name: Bundle ldgallery compiler | 104 | - name: Bundle ldgallery compiler |
105 | uses: actions/download-artifact@v2 | 105 | uses: actions/download-artifact@v3 |
106 | with: | 106 | with: |
107 | name: compiler-dist-windows-2019 | 107 | name: compiler-dist-windows-2019 |
108 | path: dist | 108 | path: dist |
@@ -135,7 +135,7 @@ jobs: | |||
135 | 7z e ~/downloads/"$MAGICK_LATEST" -so LICENSE.txt > dist/magick.license.txt | 135 | 7z e ~/downloads/"$MAGICK_LATEST" -so LICENSE.txt > dist/magick.license.txt |
136 | 7z e ~/downloads/"$MAGICK_LATEST" -so NOTICE.txt > dist/magick.notice.txt | 136 | 7z e ~/downloads/"$MAGICK_LATEST" -so NOTICE.txt > dist/magick.notice.txt |
137 | 7z e ~/downloads/"$MAGICK_LATEST" -so README.txt > dist/magick.readme.txt | 137 | 7z e ~/downloads/"$MAGICK_LATEST" -so README.txt > dist/magick.readme.txt |
138 | - uses: actions/upload-artifact@v2 |