Skip to content

Commit 1113a17

Browse files
authored
Merge branch 'quarkusio:develop' into WhatIsQuarkus_updates
2 parents 0b465ef + 0e794c7 commit 1113a17

File tree

9,285 files changed

+1172937
-265697
lines changed

Some content is hidden

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

9,285 files changed

+1172937
-265697
lines changed

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ contact_links:
1111
about: If you prefer live chat with the developers, we have a Zulip chat where we all hang out.
1212
- name: Quarkus Development mailing list
1313
url: https://groups.google.com/forum/#!forum/quarkus-dev
14-
about: You can also ask questions on our mailing list.
14+
about: Mailing list for discussing development of Quarkus itself, and development of Quarkus extensions

.github/report-status-in-issue.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//usr/bin/env jbang "$0" "$@" ; exit $?
22

3-
//DEPS org.kohsuke:github-api:1.101
4-
//DEPS info.picocli:picocli:4.2.0
3+
//DEPS org.kohsuke:github-api:1.318
4+
//DEPS info.picocli:picocli:4.7.5
55

66
import org.kohsuke.github.*;
77
import picocli.CommandLine;
@@ -87,7 +87,7 @@ public void run() {
8787
private static boolean isOpen(GHIssue issue) {
8888
return (issue.getState() == GHIssueState.OPEN);
8989
}
90-
90+
9191
public static void main(String... args) {
9292
int exitCode = new CommandLine(new Report()).execute(args);
9393
System.exit(exitCode);

.github/workflows/build.yml

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,23 @@ concurrency:
1010

1111
jobs:
1212
build:
13-
runs-on: ubuntu-20.04
13+
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
16+
with:
17+
fetch-depth: 5000
18+
fetch-tags: false
1619

1720
- name: Set up ruby
1821
uses: ruby/setup-ruby@v1
1922
with:
20-
ruby-version: 2.7 # can change this to 2.7 or whatever version you prefer
23+
ruby-version: 3.2.3
24+
25+
- name: Install git-restore-time
26+
run: sudo apt-get install -y git-restore-mtime
27+
28+
- name: Restore mtime
29+
run: git restore-mtime
2130

2231
- name: Build Jekyll site
2332
uses: limjh16/jekyll-action-ts@v2
@@ -49,7 +58,7 @@ jobs:
4958
### If jekyll_src is set, the action would automatically choose the Gemfile in jekyll_src.
5059
### In that case this input may not be needed as well.
5160
#
52-
# key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
61+
key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
5362
# restore-keys: ${{ runner.os }}-gems-
5463
### In cases where you want to specify the cache key, enable the above 2 inputs
5564
### Follows the format here https://github.com/actions/cache
@@ -61,8 +70,15 @@ jobs:
6170
- name: Store PR id
6271
run: echo ${{ github.event.number }} > ./_site/pr-id.txt
6372

73+
- name: Reduce the size of the website to be compatible with surge
74+
run: |
75+
find assets/images/posts/ -mindepth 1 -maxdepth 1 -type d -mtime +100 -exec rm -rf _site/{} \;
76+
find newsletter/ -mindepth 1 -maxdepth 1 -type d -mtime +100 -exec rm -rf _site/{} \;
77+
rm -rf _site/assets/images/worldtour/2023
78+
rm -rf _site/assets/images/desktopwallpapers
79+
6480
- name: Publishing directory for PR preview
65-
uses: actions/upload-artifact@v3
81+
uses: actions/upload-artifact@v4
6682
with:
6783
name: site
6884
path: ./_site

.github/workflows/deploy.yml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,22 @@ on:
77
push:
88
branches:
99
- develop
10+
11+
concurrency:
12+
group: ${{ github.workflow }}
13+
cancel-in-progress: true
14+
1015
jobs:
1116
deploy:
12-
runs-on: ubuntu-20.04
17+
runs-on: ubuntu-latest
1318
steps:
1419

15-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
1621

1722
- name: Set up ruby
1823
uses: ruby/setup-ruby@v1
1924
with:
20-
ruby-version: 2.7 # can change this to 2.7 or whatever version you prefer
25+
ruby-version: 3.2.3
2126

2227
- name: Build Jekyll site
2328
uses: limjh16/jekyll-action-ts@v2

.github/workflows/preview-teardown.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
steps:
1111
- name: Teardown surge preview
1212
id: deploy
13-
run: npx surge teardown https://quarkus-website-pr-${{ github.event.number }}-preview.surge.sh --token ${{ secrets.SURGE_TOKEN }}
13+
run: npx surge teardown https://quarkus-site-pr-${{ github.event.number }}-preview.surge.sh --token ${{ secrets.SURGE_TOKEN }}
1414
- name: Update PR status comment
1515
uses: actions-cool/[email protected]
1616
with:

.github/workflows/preview.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,21 @@ jobs:
2020
- name: Store PR id as variable
2121
id: pr
2222
run: |
23-
echo "id=$(<pr-id.txt)" >> $GITHUB_OUTPUT
23+
echo "id=$(<pr-id.txt)" >> $GITHUB_OUTPUT
2424
rm -f pr-id.txt
2525
- name: Publishing to surge for preview
2626
id: deploy
27-
run: npx surge ./ --domain https://quarkus-website-pr-${{ steps.pr.outputs.id }}-preview.surge.sh --token ${{ secrets.SURGE_TOKEN }}
27+
run: npx surge ./ --domain https://quarkus-site-pr-${{ steps.pr.outputs.id }}-preview.surge.sh --token ${{ secrets.SURGE_TOKEN }}
2828
- name: Update PR status comment on success
2929
uses: actions-cool/[email protected]
3030
with:
3131
token: ${{ secrets.GITHUB_TOKEN }}
3232
body: |
33-
🎊 PR Preview ${{ github.sha }} has been successfully built and deployed to https://quarkus-website-pr-${{ steps.pr.outputs.id }}-preview.surge.sh
33+
🎊 PR Preview ${{ github.sha }} has been successfully built and deployed to https://quarkus-site-pr-${{ steps.pr.outputs.id }}-preview.surge.sh
34+
35+
- Images of blog posts older than 3 months are not available.
36+
- Newsletters older than 3 months are not available.
37+
3438
<img width="300" src="https://user-images.githubusercontent.com/507615/90250366-88233900-de6e-11ea-95a5-84f0762ffd39.png">
3539
<!-- Sticky Pull Request Comment -->
3640
body-include: '<!-- Sticky Pull Request Comment -->'

.github/workflows/sync-main-doc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ jobs:
1717
repository: quarkusio/quarkus
1818
path: .quarkus-main-repository
1919

20-
- name: Install JDK 11
20+
- name: Install JDK 17
2121
uses: actions/setup-java@v3
2222
with:
2323
distribution: temurin
24-
java-version: 11
24+
java-version: 17
2525
- name: Get Date
2626
id: get-date
2727
run: |
@@ -41,7 +41,7 @@ jobs:
4141
- name: Rebase before rsync
4242
run: |
4343
git pull origin develop --rebase
44-
44+
4545
- name: Sync guides and generated documentation
4646
run: |
4747
.quarkus-main-repository/docs/sync-web-site.sh main ${PWD}

Gemfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ group :jekyll_plugins do
2525
gem 'jekyll-asciidoc'
2626
gem 'jekyll-paginate-v2'
2727
gem 'jekyll-archives'
28+
gem 'jekyll-auto-authors'
2829
end
2930

3031
# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
@@ -35,3 +36,6 @@ gem "wdm", "~> 0.1.0" if Gem.win_platform?
3536

3637

3738
gem "webrick", "~> 1.7"
39+
40+
# Copy search-wc.js from the search-wc server
41+
gem "open-uri", "~> 0.4.1"

Gemfile.lock

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ GEM
66
asciidoctor (2.0.15)
77
colorator (1.1.0)
88
concurrent-ruby (1.1.8)
9+
date (3.3.4)
910
em-websocket (0.5.2)
1011
eventmachine (>= 0.12.9)
1112
http_parser.rb (~> 0.6.0)
@@ -35,6 +36,9 @@ GEM
3536
jekyll-asciidoc (3.0.0)
3637
asciidoctor (>= 1.5.0)
3738
jekyll (>= 3.0.0)
39+
jekyll-auto-authors (1.0.4)
40+
jekyll (>= 3.0.0)
41+
jekyll-paginate-v2 (>= 3.0.0)
3842
jekyll-feed (0.15.1)
3943
jekyll (>= 3.7, < 5.0)
4044
jekyll-paginate-v2 (3.0.0)
@@ -58,6 +62,10 @@ GEM
5862
jekyll (>= 3.5, < 5.0)
5963
jekyll-feed (~> 0.9)
6064
jekyll-seo-tag (~> 2.1)
65+
open-uri (0.4.1)
66+
stringio
67+
time
68+
uri
6169
pathutil (0.16.2)
6270
forwardable-extended (~> 2.6)
6371
public_suffix (4.0.6)
@@ -69,9 +77,13 @@ GEM
6977
safe_yaml (1.0.5)
7078
sassc (2.4.0)
7179
ffi (~> 1.9)
80+
stringio (3.1.0)
7281
terminal-table (1.8.0)
7382
unicode-display_width (~> 1.1, >= 1.1.1)
83+
time (0.3.0)
84+
date
7485
unicode-display_width (1.7.0)
86+
uri (0.13.0)
7587
webrick (1.7.0)
7688

7789
PLATFORMS
@@ -81,9 +93,11 @@ DEPENDENCIES
8193
jekyll (~> 4.1.1)
8294
jekyll-archives
8395
jekyll-asciidoc
96+
jekyll-auto-authors
8497
jekyll-feed (~> 0.6)
8598
jekyll-paginate-v2
8699
minima (~> 2.0)
100+
open-uri (~> 0.4.1)
87101
tzinfo-data
88102
webrick (~> 1.7)
89103

README.md

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,32 @@ These instructions will get you a copy of the Quarkus.io website up and running
66

77
### Installation
88

9-
#### Using Docker
9+
#### Using Docker or Podman
1010

11-
1. Install [Docker Desktop](https://docs.docker.com/install/).
11+
1. Install [Docker Desktop](https://docs.docker.com/install/) or [Podman Desktop](https://podman-desktop.io/downloads/).
1212
2. Fork the [project repository](https://github.com/quarkusio/quarkusio.github.io), then clone your fork.
1313

1414
git clone [email protected]:YOUR_USER_NAME/quarkusio.github.io.git
1515

1616
3. Change into the project directory:
1717

1818
cd quarkusio.github.io
19-
4. Run Docker Composer
2019

21-
docker-compose up
20+
4. Run Docker Compose using `compose.sh`
21+
22+
compose.sh
23+
24+
5. *OR* run docker compose manually setting _SELINUX_ to "Z:" or "" dependent on OS:
25+
26+
_SELINUX_=Z: docker-compose up # Linux
27+
_SELINUX_= docker-compose up # Mac or Windows
2228

2329
5. Now browse to http://localhost:4000
30+
2431
#### Using a local Ruby environment
2532
[Jekyll static site generator docs](https://jekyllrb.com/docs/).
2633

27-
1. Install a full [Ruby development environment](https://jekyllrb.com/docs/installation/). If you use `rvm`, run: `rvm use 2.7.1`.
34+
1. Install a full [Ruby development environment](https://jekyllrb.com/docs/installation/). If you use `rvm`, run: `rvm use 3.2.3`.
2835
2. Install [bundler](https://jekyllrb.com/docs/ruby-101/#bundler) [gems](https://jekyllrb.com/docs/ruby-101/#gems)
2936

3037
gem install bundler

0 commit comments

Comments
 (0)