From cbee1580084766575c9c2787d5bc9cd48b190d73 Mon Sep 17 00:00:00 2001 From: "Daniel A. A. Pelsmaeker" Date: Thu, 1 Aug 2024 15:25:43 +0200 Subject: [PATCH] Update repo metadata --- .github/ISSUE_TEMPLATE/20-report-a-bug.yml | 65 ++++++++++++++++++++++ .github/ISSUE_TEMPLATE/bug-report.md | 37 ------------ .github/ISSUE_TEMPLATE/config.yml | 18 +++++- .github/workflows/build.yaml | 10 +++- README.md | 31 ++++++----- build.gradle.kts | 4 +- repo.yaml | 10 +--- 7 files changed, 110 insertions(+), 65 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/20-report-a-bug.yml delete mode 100644 .github/ISSUE_TEMPLATE/bug-report.md diff --git a/.github/ISSUE_TEMPLATE/20-report-a-bug.yml b/.github/ISSUE_TEMPLATE/20-report-a-bug.yml new file mode 100644 index 000000000..c5a17cc3c --- /dev/null +++ b/.github/ISSUE_TEMPLATE/20-report-a-bug.yml @@ -0,0 +1,65 @@ +--- +# !! THIS FILE WAS GENERATED USING repoman !! +# Modify `repo.yaml` instead and use `repoman` to update this file +# See: https://github.com/metaborg/metaborg-gradle/ + +name: "🐞 Report a Bug" +description: File a bug report or issue for any project in Stratego. +title: "[Bug]: " +labels: + - "Type-Bug" + - "State-Triage" +assignees: + - Apanatshka +body: + - type: dropdown + id: project + attributes: + label: For which project in this repository does the issue occur? + multiple: true + options: + - ":gpp" + - ":org.metaborg.meta.lang.stratego" + - ":stratego.build" + - ":stratego.build.spoofax2" + - ":stratego.lang" + - ":strategolib" + - type: textarea + attributes: + label: Version + description: The version of Spoofax or the commit of this project where the issue occurs. + validations: + required: false + - type: textarea + attributes: + label: Describe the issue + description: A clear and concise description of what the bug is. + validations: + required: false + - type: textarea + attributes: + label: Expected Behavior + description: A concise description of what you expected to happen. + validations: + required: false + - type: textarea + attributes: + label: Actual Behavior + description: A concise description of what happened instead. + validations: + required: false + - type: textarea + attributes: + label: Steps To Reproduce + description: Steps to reproduce the behavior. + validations: + required: false + - type: textarea + attributes: + label: Anything else? + description: | + Links? References? Anything that will give us more context about the issue you are encountering! + + Tip: You can attach images, log files, or an example project by clicking this area to highlight it and then dragging files in. + validations: + required: false diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md deleted file mode 100644 index 18b87b818..000000000 --- a/.github/ISSUE_TEMPLATE/bug-report.md +++ /dev/null @@ -1,37 +0,0 @@ ---- -name: Bug report -about: File a bug report for any project in this repository -title: '' -labels: State-Triage, Type-Bug -assignees: Apanatshka - ---- - -**Describe the bug** - - -**Project** - - -**Versions** - - -**To Reproduce** - - -**Observed behaviour** - - -**Expected behaviour** - - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index e58470634..2ab1b4fa1 100644 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,8 +1,22 @@ +--- +# !! THIS FILE WAS GENERATED USING repoman !! +# Modify `repo.yaml` instead and use `repoman` to update this file +# See: https://github.com/metaborg/metaborg-gradle/ + blank_issues_enabled: false contact_links: - - name: Spoofax Documentation + - name: 📚 Spoofax Documentation url: https://www.spoofax.dev/ about: Documentation about Spoofax and all included Meta-Languages. - - name: Spoofax Support Page + - name: ⁉️ Spoofax Support Page url: https://www.spoofax.dev/support about: Information on Spoofax Support, and how to get in touch. + - name: 🙋🏽 Spoofax Users Channel + url: https://slde.slack.com/archives/C7254SF60 + about: The Spoofax Users channel on Slack. See the Spoofax Support Page on how to gain access. + - name: 💬 Discussions + url: https://github.com/metaborg/stratego/discussions/ + about: Alternatively, ask questions in the Discussions tab. + - name: 🛡️ Security issue + url: https://github.com/metaborg/stratego/security/advisories/new + about: Security issue? Do not report security issues publicly, but create a private advisory. diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f2b85fce0..364778f4b 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -1,4 +1,8 @@ --- +# !! THIS FILE WAS GENERATED USING repoman !! +# Modify `repo.yaml` instead and use `repoman` to update this file +# See: https://github.com/metaborg/metaborg-gradle/ + name: 'Build & Publish' on: # yamllint disable-line rule:truthy @@ -13,7 +17,7 @@ jobs: with: gradle-command: | gradle build -# Publish snapshots + # Publish snapshots publish-snapshot: uses: metaborg/actions/.github/workflows/gradle-publish.yaml@main with: @@ -26,7 +30,7 @@ jobs: secrets: METABORG_ARTIFACTS_USERNAME: ${{ secrets.METABORG_ARTIFACTS_USERNAME }} METABORG_ARTIFACTS_PASSWORD: ${{ secrets.METABORG_ARTIFACTS_PASSWORD }} -# Publish releases + # Publish releases publish-release: uses: metaborg/actions/.github/workflows/gradle-publish.yaml@main with: @@ -34,7 +38,7 @@ jobs: gradle publish gradle-version-command: | gradle -q :printVersion - if: "github.event_name == 'push' && startsWith(github.ref, 'refs/tags/release-')" + if: "github.event_name == 'push' && startsWith(github.ref, 'refs/tags/devenv-release/')" needs: [build] secrets: METABORG_ARTIFACTS_USERNAME: ${{ secrets.METABORG_ARTIFACTS_USERNAME }} diff --git a/README.md b/README.md index 95ba03e5d..1cd504085 100644 --- a/README.md +++ b/README.md @@ -12,19 +12,23 @@ See: https://github.com/metaborg/metaborg-gradle/ The Spoofax implementations of the Stratego language. -| Language | Latest Release | Latest Snapshot | +## Spoofax 3 Artifacts + +| Spoofax Language | Latest Release | Latest Snapshot | |----------|----------------|-----------------| | `org.metaborg.devenv:gpp` | [![Release][mvn-rel-badge:org.metaborg.devenv:gpp]][mvn:org.metaborg.devenv:gpp] | [![Snapshot][mvn-snap-badge:org.metaborg.devenv:gpp]][mvn:org.metaborg.devenv:gpp] | | `org.metaborg.devenv:org.metaborg.meta.lang.stratego` | [![Release][mvn-rel-badge:org.metaborg.devenv:org.metaborg.meta.lang.stratego]][mvn:org.metaborg.devenv:org.metaborg.meta.lang.stratego] | [![Snapshot][mvn-snap-badge:org.metaborg.devenv:org.metaborg.meta.lang.stratego]][mvn:org.metaborg.devenv:org.metaborg.meta.lang.stratego] | | `org.metaborg.devenv:stratego.lang` | [![Release][mvn-rel-badge:org.metaborg.devenv:stratego.lang]][mvn:org.metaborg.devenv:stratego.lang] | [![Snapshot][mvn-snap-badge:org.metaborg.devenv:stratego.lang]][mvn:org.metaborg.devenv:stratego.lang] | | `org.metaborg.devenv:strategolib` | [![Release][mvn-rel-badge:org.metaborg.devenv:strategolib]][mvn:org.metaborg.devenv:strategolib] | [![Snapshot][mvn-snap-badge:org.metaborg.devenv:strategolib]][mvn:org.metaborg.devenv:strategolib] | -| Artifact | Latest Release | Latest Snapshot | +| Maven Artifact | Latest Release | Latest Snapshot | |----------|----------------|-----------------| | `org.metaborg.devenv:stratego.build` | [![Release][mvn-rel-badge:org.metaborg.devenv:stratego.build]][mvn:org.metaborg.devenv:stratego.build] | [![Snapshot][mvn-snap-badge:org.metaborg.devenv:stratego.build]][mvn:org.metaborg.devenv:stratego.build] | | `org.metaborg.devenv:stratego.build.spoofax2` | [![Release][mvn-rel-badge:org.metaborg.devenv:stratego.build.spoofax2]][mvn:org.metaborg.devenv:stratego.build.spoofax2] | [![Snapshot][mvn-snap-badge:org.metaborg.devenv:stratego.build.spoofax2]][mvn:org.metaborg.devenv:stratego.build.spoofax2] | + + 1. The `org.metaborg.meta.lang.stratego*` directories contain the old Stratego editor (_Stratego 1_ or _Stratego/XT 0.17_), which uses pre-compiled libraries from the _Stratego/XT_ project that can be found in the `strategoxt` repository of this organisation. 2. The `stratego.lang*` and `stratego.test`/`stratego.example` directories contain the current _Stratego 2_ effort. 3. The `stratego.build*` directories contain the Java code that glues together code in `stratego.lang` into the _Stratego 2_ incremental compiler. @@ -46,22 +50,21 @@ Unless required by applicable law or agreed to in writing, software distributed [license]: https://github.com/metaborg/stratego/blob/master/LICENSE.md [github-badge:release]: https://img.shields.io/github/v/release/metaborg/stratego?display_name=release [github:release]: https://github.com/metaborg/stratego/releases - [mvn:org.metaborg.devenv:gpp]: https://artifacts.metaborg.org/#nexus-search;gav~org.metaborg.devenv~gpp~~~ -[mvn-rel-badge:org.metaborg.devenv:gpp]: https://img.shields.io/nexus/r/org.metaborg.devenv/gpp?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 -[mvn-snap-badge:org.metaborg.devenv:gpp]: https://img.shields.io/nexus/s/org.metaborg.devenv/gpp?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 [mvn:org.metaborg.devenv:org.metaborg.meta.lang.stratego]: https://artifacts.metaborg.org/#nexus-search;gav~org.metaborg.devenv~org.metaborg.meta.lang.stratego~~~ -[mvn-rel-badge:org.metaborg.devenv:org.metaborg.meta.lang.stratego]: https://img.shields.io/nexus/r/org.metaborg.devenv/org.metaborg.meta.lang.stratego?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 -[mvn-snap-badge:org.metaborg.devenv:org.metaborg.meta.lang.stratego]: https://img.shields.io/nexus/s/org.metaborg.devenv/org.metaborg.meta.lang.stratego?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 +[mvn:org.metaborg.devenv:stratego.build]: https://artifacts.metaborg.org/#nexus-search;gav~org.metaborg.devenv~stratego.build~~~ +[mvn:org.metaborg.devenv:stratego.build.spoofax2]: https://artifacts.metaborg.org/#nexus-search;gav~org.metaborg.devenv~stratego.build.spoofax2~~~ [mvn:org.metaborg.devenv:stratego.lang]: https://artifacts.metaborg.org/#nexus-search;gav~org.metaborg.devenv~stratego.lang~~~ -[mvn-rel-badge:org.metaborg.devenv:stratego.lang]: https://img.shields.io/nexus/r/org.metaborg.devenv/stratego.lang?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 -[mvn-snap-badge:org.metaborg.devenv:stratego.lang]: https://img.shields.io/nexus/s/org.metaborg.devenv/stratego.lang?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 [mvn:org.metaborg.devenv:strategolib]: https://artifacts.metaborg.org/#nexus-search;gav~org.metaborg.devenv~strategolib~~~ -[mvn-rel-badge:org.metaborg.devenv:strategolib]: https://img.shields.io/nexus/r/org.metaborg.devenv/strategolib?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 -[mvn-snap-badge:org.metaborg.devenv:strategolib]: https://img.shields.io/nexus/s/org.metaborg.devenv/strategolib?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 -[mvn:org.metaborg.devenv:stratego.build]: https://artifacts.metaborg.org/#nexus-search;gav~org.metaborg.devenv~stratego.build~~~ +[mvn-rel-badge:org.metaborg.devenv:gpp]: https://img.shields.io/nexus/r/org.metaborg.devenv/gpp?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 +[mvn-rel-badge:org.metaborg.devenv:org.metaborg.meta.lang.stratego]: https://img.shields.io/nexus/r/org.metaborg.devenv/org.metaborg.meta.lang.stratego?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 [mvn-rel-badge:org.metaborg.devenv:stratego.build]: https://img.shields.io/nexus/r/org.metaborg.devenv/stratego.build?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 -[mvn-snap-badge:org.metaborg.devenv:stratego.build]: https://img.shields.io/nexus/s/org.metaborg.devenv/stratego.build?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 -[mvn:org.metaborg.devenv:stratego.build.spoofax2]: https://artifacts.metaborg.org/#nexus-search;gav~org.metaborg.devenv~stratego.build.spoofax2~~~ [mvn-rel-badge:org.metaborg.devenv:stratego.build.spoofax2]: https://img.shields.io/nexus/r/org.metaborg.devenv/stratego.build.spoofax2?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 +[mvn-rel-badge:org.metaborg.devenv:stratego.lang]: https://img.shields.io/nexus/r/org.metaborg.devenv/stratego.lang?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 +[mvn-rel-badge:org.metaborg.devenv:strategolib]: https://img.shields.io/nexus/r/org.metaborg.devenv/strategolib?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 +[mvn-snap-badge:org.metaborg.devenv:gpp]: https://img.shields.io/nexus/s/org.metaborg.devenv/gpp?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 +[mvn-snap-badge:org.metaborg.devenv:org.metaborg.meta.lang.stratego]: https://img.shields.io/nexus/s/org.metaborg.devenv/org.metaborg.meta.lang.stratego?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 +[mvn-snap-badge:org.metaborg.devenv:stratego.build]: https://img.shields.io/nexus/s/org.metaborg.devenv/stratego.build?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 [mvn-snap-badge:org.metaborg.devenv:stratego.build.spoofax2]: https://img.shields.io/nexus/s/org.metaborg.devenv/stratego.build.spoofax2?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 +[mvn-snap-badge:org.metaborg.devenv:stratego.lang]: https://img.shields.io/nexus/s/org.metaborg.devenv/stratego.lang?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 +[mvn-snap-badge:org.metaborg.devenv:strategolib]: https://img.shields.io/nexus/s/org.metaborg.devenv/strategolib?server=https%3A%2F%2Fartifacts.metaborg.org&label=%20 diff --git a/build.gradle.kts b/build.gradle.kts index 0f3cdebeb..1a5d5236c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,8 +10,7 @@ import org.metaborg.convention.MavenPublishConventionExtension plugins { id("org.metaborg.convention.root-project") alias(libs.plugins.gitonium) - // Set versions for plugins to use, only applying them in subprojects (apply false here). - id("org.metaborg.devenv.spoofax.gradle.langspec") version "0.1.41" apply false + alias(libs.plugins.spoofax.gradle.langspec) apply false } rootProjectConvention { @@ -24,6 +23,7 @@ allprojects { // Configure Gitonium before setting the version gitonium { mainBranch.set("master") + tagPrefix.set("devenv-release/") } version = gitonium.version group = "org.metaborg.devenv" diff --git a/repo.yaml b/repo.yaml index 4e1f9f4e2..d3b837353 100644 --- a/repo.yaml +++ b/repo.yaml @@ -10,7 +10,7 @@ description: | The Spoofax implementations of the Stratego language. inceptionYear: "2007" -languages: +spoofax3Languages: - group: "org.metaborg.devenv" name: "gpp" description: "GPP language" @@ -24,7 +24,7 @@ languages: name: "strategolib" description: "Stratego 2 library" -libraries: +spoofax3Libraries: - group: "org.metaborg.devenv" name: "stratego.build" description: "Stratego 2 incremental compiler" @@ -53,14 +53,11 @@ developers: name: "Jeff Smits" files: - changelog: - generate: false githubWorkflows: publishRelease: true publishSnapshot: true githubIssueTemplates: generate: true - update: true assignDevelopers: true useDiscussions: true bugTypeLabel: "Type-Bug" @@ -70,8 +67,7 @@ files: featureRequestStateLabel: "State-Triage" questionStateLabel: null gradleRootProject: - update: true - createPublishTasks: true + generate: true rootProjectName: "stratego-project" includedProjects: - name: ":gpp"