This is an automated email from the ASF dual-hosted git repository. jamesfredley pushed a commit to branch apache-staging-site in repository https://gitbox.apache.org/repos/asf/grails-static-website.git
commit ae776ad4eaeb23e7f24b252b5774eabee55154f5 Author: James Fredley <[email protected]> AuthorDate: Tue Jun 3 17:47:13 2025 -0400 Publish to apache staging site via asf-site-staging branch --- .github/workflows/publish.yml | 9 ++++++--- build.gradle | 2 +- buildSrc/src/main/groovy/org/grails/guides/GuidesFetcher.groovy | 2 +- publish.sh | 8 ++++---- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 23643338c8..baed97b8a8 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: jobs: build: - if: github.repository == 'grails/grails-static-website' + if: github.repository == 'apache/grails-static-website' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -30,17 +30,20 @@ jobs: - name: Publish Main Site run: ./publish.sh env: - GITHUB_SLUG: grails/grails-static-website + GITHUB_SLUG: apache/grails-static-website GH_TOKEN: ${{ secrets.GH_TOKEN }} + GH_BRANCH: asf-site-staging # AIRTABLE_BASE_ID: ${{ secrets.AIRTABLE_BASE_ID }} # AIRTABLE_API_KEY: ${{ secrets.AIRTABLE_API_KEY }} GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} GRADLE_TASK: build + GRAILS_WS_URL: https://grails.staged.apache.org/ - name: Publish Guides Site run: ./publish.sh env: - GITHUB_SLUG: grails/grails-guides + GITHUB_SLUG: grails-guides/grails-guides-template + GH_BRANCH: gh-pages GH_TOKEN: ${{ secrets.GH_TOKEN }} GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_USER }} GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY: ${{ secrets.GRADLE_ENTERPRISE_BUILD_CACHE_NODE_KEY }} diff --git a/build.gradle b/build.gradle index 08fb96fb90..94e531c332 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ grails { template = file("templates/document.html") output = project.buildDir title = 'Grails framework' - url = System.getenv('GITHUB_RUN_ID') != null ? 'https://grails.org' : System.getenv("GRAILS_WS_URL") ?: '' + url = System.getenv("GRAILS_WS_URL") ?: 'https://grails.org' description = 'A powerful Groovy-based web application framework for the JVM built on top of Spring Boot' keywords = ['grails','jvm','framework','groovy', 'gradle', 'spring-boot', 'gorm'] robots = 'all' diff --git a/buildSrc/src/main/groovy/org/grails/guides/GuidesFetcher.groovy b/buildSrc/src/main/groovy/org/grails/guides/GuidesFetcher.groovy index f3885c12bd..db7aea13cd 100644 --- a/buildSrc/src/main/groovy/org/grails/guides/GuidesFetcher.groovy +++ b/buildSrc/src/main/groovy/org/grails/guides/GuidesFetcher.groovy @@ -10,7 +10,7 @@ import java.text.SimpleDateFormat @CompileStatic class GuidesFetcher { - public static final String GUIDES_JSON = 'https://raw.githubusercontent.com/grails/grails-guides/gh-pages/guides.json' + public static final String GUIDES_JSON = 'https://raw.githubusercontent.com/grails-guides/grails-guides-template/gh-pages/guides.json' @CompileDynamic static List<Guide> fetchGuides(boolean skipFuture = true) { diff --git a/publish.sh b/publish.sh index 81693d94c3..466b9e83c1 100755 --- a/publish.sh +++ b/publish.sh @@ -29,18 +29,18 @@ if [[ $EXIT_STATUS -ne 0 ]]; then exit $EXIT_STATUS fi -git clone https://${GH_TOKEN}@github.com/${GITHUB_SLUG}.git -b gh-pages gh-pages --single-branch > /dev/null -cd gh-pages +git clone https://${GH_TOKEN}@github.com/${GITHUB_SLUG}.git -b ${GH_BRANCH} ${GH_BRANCH} --single-branch > /dev/null +cd ${GH_BRANCH} cp -rv ../build/dist/* . if git diff --quiet; then echo "No changes in MAIN Website" else git add -A - git commit -a -m "Updating $GITHUB_SLUG gh-pages branch for Github Actions run:$GITHUB_RUN_ID" + git commit -a -m "Updating $GITHUB_SLUG ${GH_BRANCH} branch for Github Actions run:$GITHUB_RUN_ID" git push origin HEAD fi cd .. -rm -rf gh-pages +rm -rf ${GH_BRANCH} exit $EXIT_STATUS \ No newline at end of file
