Skip to content

Commit

Permalink
Merge pull request #728 from hexagontk/stable
Browse files Browse the repository at this point in the history
Stable
  • Loading branch information
jaguililla authored Sep 16, 2024
2 parents d0877bb + b66a0fd commit 8963d5d
Show file tree
Hide file tree
Showing 41 changed files with 214 additions and 441 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

on:
push:
branches-ignore: [ master, release/** ]
branches-ignore: [ main, release/** ]

permissions:
contents: read
Expand Down
102 changes: 0 additions & 102 deletions .github/workflows/nightly.yml

This file was deleted.

44 changes: 0 additions & 44 deletions .github/workflows/release.yml

This file was deleted.

24 changes: 8 additions & 16 deletions .github/workflows/release_branch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ on:
push:
branches: [ release/** ]

permissions:
contents: write

jobs:
publish:
runs-on: ubuntu-latest
Expand All @@ -27,26 +30,15 @@ jobs:
github-token: ${{ secrets.GITHUB_TOKEN }}
cache: gradle

- env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
export REMOTE="https://$GITHUB_ACTOR:[email protected]/$GITHUB_REPOSITORY.git"
git remote set-url origin "$REMOTE"
git clone "$REMOTE" --branch gh-pages build/gh-pages
./gradlew build
./gradlew -x build buildSite
ls -AlF site/build/site
- env:
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
SIGNING_KEY: ${{ secrets.SIGNING_KEY }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
run: ./gradlew --no-daemon -x test release

- run: |
cp -rf site/build/site/* build/gh-pages/
cd build/gh-pages
git add --all
git commit -m "Publishing to gh-pages"
git push origin gh-pages
push_site:
uses: hexagontk/hexagon/.github/workflows/site.yml@develop
needs: publish
with:
options: -P pushSite=true
62 changes: 0 additions & 62 deletions .github/workflows/site.yml

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ hs_err_pid*
# Other Tools
kotlin-js-store/
node_modules/
.kotlin/
.env

# System Files
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ task("nativeTestModules") {
description = "Print module descriptions to be used in the GraalVM native compliant directory."

doLast {
val gitHub = "https://github.com/hexagontk/hexagon/tree/master"
val gitHub = "https://github.com/hexagontk/hexagon/tree/main"
val entries = subprojects
.filter { sp -> sp.tasks.any { t -> t.name == "nativeTest" } }
.sortedBy { sp -> "${sp.group}:${sp.name}" }
Expand Down
30 changes: 15 additions & 15 deletions contributing.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ Aside of that kind of modules, you can also find infrastructure modules: compone
project itself. These are internal modules not intended to be directly used by users (like the
[starters] or the [site]).

[Hexagon Structure]: https://github.com/hexagontk/hexagon/blob/master/README.md#hexagon-structure
[starters]: https://github.com/hexagontk/hexagon/blob/master/starters/README.md
[site]: https://github.com/hexagontk/hexagon/blob/master/site/README.md
[Hexagon Structure]: https://github.com/hexagontk/hexagon/blob/release/3/README.md#hexagon-structure
[starters]: https://github.com/hexagontk/hexagon/blob/release/3/starters/README.md
[site]: https://github.com/hexagontk/hexagon/blob/release/3/site/README.md

## Local Setup
Hexagon build process requires a JDK 21+ to compile. You can check the required software, build the
Expand Down Expand Up @@ -104,21 +104,21 @@ If you want to generate the documentation site, check the Hexagon's site module
[GitHub Actions]: https://github.com/features/actions

## Major Release Checklist
1. Release site's dependent projects (`hexagon_extra`)
2. Publish their packages using the [Nexus Repository Manager]
3. Merge Hexagon main project to `master` in GitHub
4. Check the site deployment is OK ([https://hexagontk.com])
5. Publish Hexagon modules using the [Nexus Repository Manager]
6. Create a GitHub release
7. Update starter repositories (Gradle and Maven ones)
8. Update TFB benchmark
9. Update example projects inside the organization
10. Create a changelog to announce the release
11. Publish changelog on:
1. Replace documents' links: `/blob/main/` to `/blob/release/${version}/`
2. Release site's dependent projects (`hexagon_extra`)
3. Publish their packages using the [Nexus Repository Manager]
4. Merge Hexagon main project to `main` in GitHub
5. Check the site deployment is OK ([https://hexagontk.com])
6. Publish Hexagon modules using the [Nexus Repository Manager]
7. Create a GitHub release
8. Update starter repositories (Gradle and Maven ones)
9. Update TFB benchmark
10. Update example projects inside the organization
11. Create a changelog to announce the release
12. Publish changelog on:
* Dev.to
* Reddit Kotlin
* X (Twitter)
* Kotlin Weekly Newsletter
* LinkedIn
* Mailing lists (Awesome Kotlin, Kotlin Weekly)

Expand Down
4 changes: 2 additions & 2 deletions core/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ application), you can import it with the following code:
JVM information and other useful utilities. Includes basic program settings support at the [Jvm]
object (like loading and retrieving system settings).

[Jvm]: /api/core/com.hexagonkt.core/-jvm
[Jvm]: api/core/com.hexagonkt.core/-jvm

# Package com.hexagonkt.core.logging
Provides a logging management capabilities abstracting the application from logging libraries.
Expand All @@ -44,7 +44,7 @@ The following code block shows the most common use cases for the [Logger] class:

By default, Hexagon uses the [System.Logger] class.

[Logger]: /api/core/com.hexagonkt.core.logging/-logger
[Logger]: api/core/com.hexagonkt.core.logging/-logger
[System.Logger]: https://docs.oracle.com/javase/9/docs/api/java/lang/System.Logger.html

# Package com.hexagonkt.core.media
Expand Down
5 changes: 1 addition & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,14 +1,11 @@
# suppress inspection "UnusedProperty" for whole file

# TODO Check `hexagonal_starter` to see how to get rid of this file
# TODO Consider changing the following configuration by system properties or alike
# https://docs.gradle.org/current/userguide/build_environment.html
org.gradle.jvmargs=-Xmx8g -Dfile.encoding=UTF-8
org.gradle.warning.mode=all
org.gradle.console=plain

# Gradle
version=3.6.6
version=3.7.0
group=com.hexagonkt
description=The atoms of your platform

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
Loading

0 comments on commit 8963d5d

Please sign in to comment.