Skip to content

Commit 4c00c41

Browse files
authored
Merge branch 'gh-pages' into a
2 parents 11a74a4 + 954ea90 commit 4c00c41

709 files changed

Lines changed: 141483 additions & 7818 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/actions/deploy-to-github-pages/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ runs:
299299
# avoid test failures when HTTPS is enforced half-way through
300300
PLAYWRIGHT_EXTERNAL_HTTPS: ${{ inputs.external-https }}
301301
run: npx playwright test --project=chrome
302-
- uses: actions/upload-artifact@v4
302+
- uses: actions/upload-artifact@v7
303303
if: always() && steps.playwright.outputs.result != ''
304304
with:
305305
name: playwright-report

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ jobs:
55
build:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/checkout@v4
8+
- uses: actions/checkout@v6
99

1010
- name: configure Hugo and Pagefind version
1111
run: |
@@ -50,7 +50,7 @@ jobs:
5050
run: cd public && tar czvf ../pages.tar.gz *
5151

5252
- name: Upload build artifact
53-
uses: actions/upload-artifact@v4
53+
uses: actions/upload-artifact@v7
5454
with:
5555
name: pages
5656
path: pages.tar.gz
@@ -96,7 +96,7 @@ jobs:
9696
run: |
9797
echo "result=$PLAYWRIGHT_TEST_URL" >>$GITHUB_OUTPUT &&
9898
npx playwright test --project=chrome
99-
- uses: actions/upload-artifact@v4
99+
- uses: actions/upload-artifact@v7
100100
if: always() && steps.playwright.outputs.result != ''
101101
with:
102102
name: playwright-report

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
name: github-pages
2121
url: ${{ steps.deploy.outputs.url }}
2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v6
2424
- name: deploy to GitHub Pages
2525
id: deploy
2626
uses: ./.github/actions/deploy-to-github-pages

.github/workflows/playwright.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
timeout-minutes: 60
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515
- uses: actions/setup-node@v4
1616
with:
1717
node-version: lts/*
@@ -21,7 +21,7 @@ jobs:
2121
env:
2222
PLAYWRIGHT_TEST_URL: ${{ github.event.inputs.url }}
2323
run: npx playwright test --project=chrome
24-
- uses: actions/upload-artifact@v4
24+
- uses: actions/upload-artifact@v7
2525
if: always()
2626
with:
2727
name: playwright-report

.github/workflows/update-book.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
if: github.event.repository.fork == false || github.event_name == 'workflow_dispatch'
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v4
19+
- uses: actions/checkout@v6
2020
with:
2121
sparse-checkout: |
2222
external/book/sync
@@ -48,7 +48,7 @@ jobs:
4848
language: ${{ fromJson(needs.check-for-updates.outputs.matrix) }}
4949
fail-fast: false
5050
steps:
51-
- uses: actions/checkout@v4
51+
- uses: actions/checkout@v6
5252
with:
5353
sparse-checkout: |
5454
script
@@ -111,7 +111,7 @@ jobs:
111111
run: |
112112
git branch -m book-${{ matrix.language.lang }}
113113
git bundle create ${{ matrix.language.lang }}.bundle refs/remotes/origin/${{ github.ref_name }}..book-${{ matrix.language.lang }}
114-
- uses: actions/upload-artifact@v4
114+
- uses: actions/upload-artifact@v7
115115
with:
116116
name: bundle-${{ matrix.language.lang }}
117117
path: ${{ matrix.language.lang }}.bundle
@@ -131,7 +131,7 @@ jobs:
131131
url: ${{ steps.deploy.outputs.url }}
132132
runs-on: ubuntu-latest
133133
steps:
134-
- uses: actions/checkout@v4
134+
- uses: actions/checkout@v6
135135
- uses: actions/download-artifact@v4
136136
- name: apply updates
137137
id: apply

.github/workflows/update-download-data.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
name: github-pages
2323
url: ${{ steps.deploy.outputs.url }}
2424
steps:
25-
- uses: actions/checkout@v4
25+
- uses: actions/checkout@v6
2626
with:
2727
sparse-checkout: |
2828
.github/actions

.github/workflows/update-git-version-and-manual-pages.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
name: github-pages
2828
url: ${{ steps.deploy.outputs.url }}
2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@v6
3131
with:
3232
sparse-checkout: |
3333
.github/actions

.github/workflows/update-translated-manual-pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
if: github.event.repository.fork == false || github.event_name == 'workflow_dispatch'
2020
runs-on: ubuntu-latest
2121
steps:
22-
- uses: actions/checkout@v4
22+
- uses: actions/checkout@v6
2323
with:
2424
sparse-checkout: |
2525
external/docs/sync
@@ -46,7 +46,7 @@ jobs:
4646
name: github-pages
4747
url: ${{ steps.deploy.outputs.url }}
4848
steps:
49-
- uses: actions/checkout@v4
49+
- uses: actions/checkout@v6
5050
- name: ruby setup
5151
uses: ruby/setup-ruby@v1
5252
with:

Gemfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
addressable (2.8.7)
5-
public_suffix (>= 2.0.2, < 7.0)
4+
addressable (2.9.0)
5+
public_suffix (>= 2.0.2, < 8.0)
66
asciidoctor (2.0.23)
77
base64 (0.2.0)
88
diffy (3.4.3)
@@ -14,7 +14,7 @@ GEM
1414
net-http (~> 0.5)
1515
faraday-retry (2.2.1)
1616
faraday (~> 2.0)
17-
json (2.18.1)
17+
json (2.19.2)
1818
logger (1.7.0)
1919
net-http (0.9.1)
2020
uri (>= 0.11.1)
@@ -38,7 +38,7 @@ GEM
3838
faraday (>= 1, < 3)
3939
sawyer (~> 0.9)
4040
parslet (2.0.0)
41-
public_suffix (6.0.1)
41+
public_suffix (7.0.5)
4242
racc (1.8.1)
4343
rexml (3.4.2)
4444
rss (0.3.1)
@@ -69,14 +69,14 @@ DEPENDENCIES
6969
rss
7070

7171
CHECKSUMS
72-
addressable (2.8.7) sha256=462986537cf3735ab5f3c0f557f14155d778f4b43ea4f485a9deb9c8f7c58232
72+
addressable (2.9.0) sha256=7fdf6ac3660f7f4e867a0838be3f6cf722ace541dd97767fa42bc6cfa980c7af
7373
asciidoctor (2.0.23) sha256=52208807f237dfa0ca29882f8b13d60b820496116ad191cf197ca56f2b7fddf3
7474
base64 (0.2.0) sha256=0f25e9b21a02a0cc0cea8ef92b2041035d39350946e8789c562b2d1a3da01507
7575
diffy (3.4.3) sha256=4264b9e7db00d1cd426fcd32e36565779163cedc2340a95b0e6f025e71f9aaa7
7676
faraday (2.14.1) sha256=a43cceedc1e39d188f4d2cdd360a8aaa6a11da0c407052e426ba8d3fb42ef61c
7777
faraday-net_http (3.4.2) sha256=f147758260d3526939bf57ecf911682f94926a3666502e24c69992765875906c
7878
faraday-retry (2.2.1) sha256=4146fed14549c0580bf14591fca419a40717de0dd24f267a8ec2d9a728677608
79-
json (2.18.1) sha256=fe112755501b8d0466b5ada6cf50c8c3f41e897fa128ac5d263ec09eedc9f986
79+
json (2.19.2) sha256=e7e1bd318b2c37c4ceee2444841c86539bc462e81f40d134cf97826cb14e83cf
8080
logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
8181
net-http (0.9.1) sha256=25ba0b67c63e89df626ed8fac771d0ad24ad151a858af2cc8e6a716ca4336996
8282
nokogiri (1.19.1-aarch64-linux-gnu) sha256=cfdb0eafd9a554a88f12ebcc688d2b9005f9fce42b00b970e3dc199587b27f32
@@ -89,7 +89,7 @@ CHECKSUMS
8989
nokogiri (1.19.1-x86_64-linux-musl) sha256=4267f38ad4fc7e52a2e7ee28ed494e8f9d8eb4f4b3320901d55981c7b995fc23
9090
octokit (9.2.0) sha256=4fa47ff35ce654127edf2c836ab9269bcc8829f5542dc1e86871f697ce7f4316
9191
parslet (2.0.0) sha256=d45130695d39b43d7e6a91f4d2ec66b388a8d822bae38de9b4de9a5fbde1f606
92-
public_suffix (6.0.1) sha256=61d44e1cab5cbbbe5b31068481cf16976dd0dc1b6b07bd95617ef8c5e3e00c6f
92+
public_suffix (7.0.5) sha256=1a8bb08f1bbea19228d3bed6e5ed908d1cb4f7c2726d18bd9cadf60bc676f623
9393
racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
9494
rexml (3.4.2) sha256=1384268554a37af5da5279431ca3f2f37d46f09ffdd6c95e17cc84c83ea7c417
9595
rss (0.3.1) sha256=b46234c04551b925180f8bedfc6f6045bf2d9998417feda72f300e7980226737

external/book/content/book/nl/v2/_index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
language_code: nl
99
front_page: true
1010
repository_url: https://github.com/progit/progit2-nl
11-
sha: ad5f35174bdab874a3cd553239dc61e09f953b18
11+
sha: 273e7a016cddbacf9438c2f131a6295ba17a954f
1212
ebook_pdf: https://github.com/progit/progit2-nl/releases/download/2.1.117/progit.pdf
1313
ebook_epub: https://github.com/progit/progit2-nl/releases/download/2.1.117/progit.epub
1414
page_title: Git - Book

0 commit comments

Comments
 (0)