Skip to content

Commit feed1cd

Browse files
Merge remote-tracking branch 'upstream/master' into chore/cleanup-empty-styles
# Conflicts: # pages/community.html # pages/learning.html
2 parents 12ca59e + 58a760b commit feed1cd

173 files changed

Lines changed: 8325 additions & 5717 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/workflows/gradle.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,17 @@ jobs:
1818
steps:
1919
- uses: actions/checkout@v4
2020
- name: Set up JDK
21-
uses: actions/setup-java@v4
21+
uses: actions/setup-java@v5
2222
with:
2323
distribution: liberica
24-
java-version: '11'
24+
java-version: 17
2525
- name: Setup Gradle
26-
uses: gradle/actions/setup-gradle@v4
26+
uses: gradle/actions/setup-gradle@v5
2727
with:
2828
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
2929
- name: Run Tests
3030
run: |
3131
(set -x; ./gradlew clean check --no-daemon)
32-
env:
33-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
34-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
3532
- name: Publish Test Report
3633
if: failure()
3734
uses: scacap/action-surefire-report@v1

.github/workflows/publish.yml

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,30 +13,32 @@ jobs:
1313
if: github.repository == 'apache/grails-static-website'
1414
runs-on: ubuntu-latest
1515
steps:
16-
- name: Maximize build space
17-
uses: easimon/maximize-build-space@c28619d8999a147d5e09c1199f84ff6af6ad5794
18-
with:
19-
root-reserve-mb: 3072 # Leave ~3 GB on root FS (default)
20-
swap-size-mb: 2048 # Allocate 2 GB swap (default: 4 GB; reduce if not needed)
21-
remove-dotnet: 'true' # Remove .NET SDK (~3-4 GB savings)
22-
remove-android: 'true' # Remove Android tools (~2 GB savings)
23-
remove-haskell: 'true' # Remove Haskell (~1 GB savings)
24-
remove-codeql: 'true' # Remove CodeQL (~500 MB savings)
25-
remove-docker-images: 'false' # Prune Docker if used (~1-2 GB savings)
26-
- uses: actions/checkout@v4
27-
- uses: actions/cache@v4
16+
- name: "⚙️ Maximize build space"
17+
run: |
18+
echo "-- Dotnet"
19+
sudo rm -rf /usr/share/dotnet
20+
echo "-- Android"
21+
sudo rm -rf /usr/local/lib/android
22+
echo "-- Haskell"
23+
sudo rm -rf /opt/ghc
24+
echo "-- CodeQL"
25+
sudo rm -rf /opt/hostedtoolcache/CodeQL
26+
27+
df -h
28+
- uses: actions/checkout@v6
29+
- uses: actions/cache@v5
2830
with:
2931
path: ~/.gradle/caches
3032
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }}
3133
restore-keys: |
3234
${{ runner.os }}-gradle-
3335
- name: Set up JDK
34-
uses: actions/setup-java@v4
36+
uses: actions/setup-java@v5
3537
with:
3638
distribution: liberica
37-
java-version: '11'
39+
java-version: 17
3840
- name: Setup Gradle
39-
uses: gradle/actions/setup-gradle@v4
41+
uses: gradle/actions/setup-gradle@v5
4042
with:
4143
develocity-access-key: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
4244
- name: Publish Main Site
@@ -45,8 +47,6 @@ jobs:
4547
GITHUB_SLUG: apache/grails-website
4648
GH_TOKEN: ${{ secrets.GRAILS_GHTOKEN }}
4749
GH_BRANCH: asf-site-production
48-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
49-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
5050
GRADLE_TASK: build
5151
GRAILS_WS_URL: https://grails.apache.org
5252
- name: Publish Guides Site
@@ -55,6 +55,4 @@ jobs:
5555
GITHUB_SLUG: grails-guides/grails-guides-template
5656
GH_BRANCH: gh-pages
5757
GH_TOKEN: ${{ secrets.APACHE_GRAILS_BUILD_GH_TOKEN }}
58-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }}
59-
GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }}
6058
GRADLE_TASK: buildGuide

.github/workflows/rendersite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
- name: Set up JDK 11
99
uses: actions/setup-java@v4
1010
with:
11-
java-version: '11'
11+
java-version: 17
1212
distribution: liberica
1313
- name: Setup Gradle
1414
uses: gradle/actions/setup-gradle@v4

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
.idea
2+
!.idea/codeStyles/
3+
!.idea/codeStyles/Project.xml
4+
!.idea/codeStyles/codeStyleConfig.xml
25
*.iml
36
*.ipr
47
*.iws

README.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,20 +74,30 @@ The output can be found in the `build/dist` directory.
7474

7575
```bash
7676
./gradlew buildGuide --console=plain
77-
7877
```
7978
The output can be found in the `build/dist` directory.
8079

81-
## Running the website locally
80+
This will generate links to https://grails.apache.org if you want the links to point to your local webserver you need to
81+
set this environment variable before running the build commands (port number depend on webserver...):
82+
83+
```bash
84+
export GRAILS_WS_URL=http://127.0.0.1:8000
85+
```
8286

83-
The easiest way to work locally is to generate the site and setup your Webserver to serve build/dist.
87+
## Running the website locally
8488

89+
The easiest way to work locally is to generate the site and set up your Webserver to serve build/dist.
8590

86-
### Using MAMP
91+
### Using jwebserver
8792

88-
Go to [MAMP](https://www.mamp.info/en/mamp/) for installation instructions:
93+
JDK 19+ comes with a simpel webserver called [jwebserver](https://docs.oracle.com/en/java/javase/25/docs/specs/man/jwebserver.html) that can be used for serving static files:
8994

90-
![](docs/mamp.png)
95+
```bash
96+
$ jwebserver -d $(pwd)/build/dist
97+
Binding to loopback by default. For all interfaces use "-b 0.0.0.0" or "-b ::".
98+
Serving /home/user/grails-static-website/build/dist and subdirectories on 127.0.0.1 port 8000
99+
URL http://127.0.0.1:8000/
100+
```
91101

92102
### Using Python
93103

assets/images/bsky.svg

Lines changed: 22 additions & 0 deletions
Loading
306 KB
Loading

assets/images/mastodont.svg

Lines changed: 33 additions & 0 deletions
Loading
295 KB
Loading

assets/javascripts/navigation.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
function show(showId, hideId) {
2-
document.getElementById(showId).style.display = "block"
3-
document.getElementById(hideId).style.display = "none"
2+
document.getElementById(showId).style.display = 'block'
3+
document.getElementById(hideId).style.display = 'none'
44
}

0 commit comments

Comments
 (0)