Merge remote-tracking branch 'refs/remotes/origin/main'

This commit is contained in:
Jesse Brault 2025-06-01 20:18:50 +00:00
commit bd703bf829
5 changed files with 21 additions and 9 deletions

View File

@ -1,10 +1,11 @@
name: Jb-ssg-site CI Pipeline name: Jb-ssg-site CI Pipeline
on: on:
push: push:
branches: tags:
- main - 'v*'
jobs: jobs:
ci: ci:
if: github.event.base_ref == 'refs/heads/main'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout the code. - name: Checkout the code.

View File

@ -1,13 +1,22 @@
plugins { plugins {
id 'com.jessebrault.ssg' version '0.4.2' id 'com.jessebrault.ssg' version '0.5.0-SNAPSHOT'
id 'distribution' id 'distribution'
} }
group = 'com.jessebrault' group = 'com.jessebrault'
version = '0.1.0' version = '0.1.1-SNAPSHOT'
repositories { repositories {
mavenCentral() mavenCentral()
maven {
url 'https://archiva.jessebrault.com/repository/snapshots/'
credentials {
username System.getenv('JBARCHIVA_USERNAME')
password System.getenv('JBARCHIVA_PASSWORD')
}
}
maven { maven {
url 'https://archiva.jessebrault.com/repository/internal/' url 'https://archiva.jessebrault.com/repository/internal/'
@ -27,7 +36,9 @@ sourceSets {
} }
dependencies { dependencies {
implementation 'org.apache.groovy:groovy:4.0.21' implementation 'org.apache.groovy:groovy:4.0.25'
implementation 'com.jessebrault.ssg:cli:0.5.0-SNAPSHOT'
serverImplementation 'org.eclipse.jetty:jetty-server:12.0.9' serverImplementation 'org.eclipse.jetty:jetty-server:12.0.9'
serverImplementation 'info.picocli:picocli:4.7.6' serverImplementation 'info.picocli:picocli:4.7.6'

View File

@ -9,10 +9,10 @@ import com.jessebrault.site.icon.YoutubeIcon
<body> <body>
<div class="header-banner-container"> <div class="header-banner-container">
<Header /> <Header />
<Outlet children={[banner()]} /> <Render item={banner()} />
</div> </div>
<main> <main>
<Outlet children={mainChildren} /> <Render items={mainChildren} />
</main> </main>
<footer> <footer>
<div class="social-icons"> <div class="social-icons">

View File

@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.1-bin.zip
networkTimeout=10000 networkTimeout=10000
validateDistributionUrl=true validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME

View File

@ -2,7 +2,7 @@ pluginManagement {
repositories { repositories {
mavenCentral() mavenCentral()
maven { maven {
url 'https://archiva.jessebrault.com/repository/internal/' url 'https://archiva.jessebrault.com/repository/snapshots/'
credentials { credentials {
username System.getenv('JBARCHIVA_USERNAME') username System.getenv('JBARCHIVA_USERNAME')