Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge into 2021.3 #77

Merged
merged 48 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
7d01618
Merge pull request #67 from LionWeb-io/niko/fix-realworld-languages-2…
enikao Nov 3, 2023
8e70288
Merge pull request #69 from LionWeb-io/niko/fix-realworld-languages-2…
enikao Nov 3, 2023
6f027b9
[Gradle Release Plugin] - pre tag commit: '0.1.2'.
Nov 3, 2023
f6a552d
[Gradle Release Plugin] - new version commit: '0.1.3-SNAPSHOT'.
Nov 3, 2023
f403525
[Gradle Release Plugin] - pre tag commit: '0.1.2'.
Nov 3, 2023
060db9d
Revert " [Gradle Release Plugin] - pre tag commit: '0.1.2'."
Nov 3, 2023
332e1b5
trying to include MPS version into release tag
Nov 3, 2023
27fd81a
[Gradle Release Plugin] - pre tag commit: '0.1.2'.
Nov 3, 2023
7b30d22
Revert " [Gradle Release Plugin] - pre tag commit: '0.1.2'."
Nov 3, 2023
dcaed51
trying again to include MPS version into release tag
Nov 3, 2023
e030637
[Gradle Release Plugin] - pre tag commit: '2021.2-0.1.2-SNAPSHOT'.
Nov 3, 2023
b759e66
[Gradle Release Plugin] - new version commit: '2021.2-0.1.2-SNAPSHOT'.
Nov 3, 2023
d6aa682
remove -SNAPSHOT suffix from release tag
Nov 3, 2023
fdc7913
commented out dependency on mps-extensions (again)
Nov 6, 2023
9943ade
Merge pull request #71 from LionWeb-io/niko/fix-tag
enikao Nov 6, 2023
9d2186d
added release github action
Nov 6, 2023
11d8de2
Merge pull request #72 from LionWeb-io/niko/release-action
enikao Nov 6, 2023
fe0ca09
try to get signing work on GitHub action
Nov 6, 2023
b4eec2c
access environment instead of project for secrets
Nov 6, 2023
28d0818
added debug output
Nov 6, 2023
8bd5074
[Gradle Release Plugin] - new version commit: '2021.1-0.1.3'.
Nov 6, 2023
e5ca005
getting publishing user/pwd from GH secrets
Nov 6, 2023
239e3e1
using credentials at the right place
Nov 6, 2023
a7018ec
[Gradle Release Plugin] - pre tag commit: '2021.1-0.1.4'.
Nov 6, 2023
f7b3adf
[Gradle Release Plugin] - new version commit: '2021.1-0.1.4'.
Nov 6, 2023
a25f0e2
honor externally set release version
Nov 6, 2023
0ffa4ed
honor externally set release version, trial 2
Nov 6, 2023
3a339e7
honor externally set release version, trial 3
Nov 6, 2023
b4e4019
[Gradle Release Plugin] - pre tag commit: '2021.1-0.1.30'.
Nov 6, 2023
ad9534a
[Gradle Release Plugin] - new version commit: '2021.1-0.1.30'.
Nov 6, 2023
50bbb88
reset release version from trials
Nov 6, 2023
ecfd9e5
Merge pull request #73 from LionWeb-io/niko/sign-release
enikao Nov 7, 2023
622a930
distributed test code to more solutions
Nov 6, 2023
1225776
something's working
Nov 7, 2023
2a5a6b7
der geht!
Nov 7, 2023
6d88c87
tests running
Nov 7, 2023
82fbdfc
cleaned up build model
Nov 7, 2023
23ebb49
move over test build yaml from other branch
Nov 7, 2023
c344a82
make tests work
Nov 7, 2023
f1d2abf
unified github actions
Nov 7, 2023
b8e3541
Merge pull request #74 from LionWeb-io/niko/enable-tests
enikao Nov 7, 2023
8a716f7
Merge branch 'mps2021.1' into niko/merge2021.2
Nov 7, 2023
1df5eca
ran migrations
Nov 7, 2023
c815d2d
updated build model
Nov 7, 2023
d854d1d
Merge pull request #76 from LionWeb-io/niko/merge2021.2
enikao Nov 7, 2023
dfa14b7
Merge branch 'mps2021.2' into merge2021.3
Nov 7, 2023
b3d89c1
ran migrations
Nov 7, 2023
f0aee3d
updated build models
Nov 7, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 25 additions & 4 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,37 @@ on: [push]

jobs:
build:

runs-on: ubuntu-latest
name: Java 11 Build
name: Java 11 Build and Test

steps:
- uses: actions/checkout@v1

- name: Install dependencies
run: sudo apt-get install -y x11vnc xvfb

- name: Setup java
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 11
- name: Build languages
run: ./gradlew assembleMps

- name: Setup Gradle
uses: gradle/gradle-build-action@v2
with:
cache-disabled: false

- name: Test languages
run: xvfb-run ./gradlew checkMps

- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@v2
if: always()
with:
files: |
TEST-*.xml
large_files: "true"
report_individual_runs: "true"
report_suite_logs: "any"
check_run_annotations: all tests, skipped tests
action_fail: "true"
65 changes: 65 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
# gradle-release-plugin.yml
# from https://wszlosek.github.io/DevDawn/2023/06/28/gradle-release-plugin.html

name: Create release

# Controls when the action will run
# Option bellow allows you to run the workflow manually
on:
workflow_dispatch:
inputs:
release_version:
description: 'Release new version'

# Allow GitHub Actions to push changes to the repository
permissions:
contents: write

jobs:
release:
name: Release
runs-on: ubuntu-latest
steps:

- name: Checkout
uses: actions/checkout@v2

- name: Install dependencies
run: sudo apt-get install -y x11vnc xvfb

- name: Setup java
uses: actions/setup-java@v2
with:
distribution: 'adopt'
java-version: 11

- name: Setup Gradle
uses: gradle/gradle-build-action@v2

# Setup git config of the GitHub Actions Bot
- name: Setup git config
run: |
git config user.name "GitHub Actions Bot"
git config user.email "<>"

# Run release task
- name: Release with Gradle Release Plugin
env:
SIGNING_KEY: ${{ secrets.OSSRH_GPG_SECRET_KEY }}
SIGNING_PASSWORD: ${{ secrets.OSSRH_GPG_SECRET_KEY_PASSWORD }}
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
RELEASE_VERSION: ${{ inputs.release_version }}
run: xvfb-run ./gradlew release

- name: Publish Test Results
uses: EnricoMi/publish-unit-test-result-action@v2
if: always()
with:
files: |
TEST-*.xml
large_files: "true"
report_individual_runs: "true"
report_suite_logs: "any"
check_run_annotations: all tests, skipped tests
action_fail: "true"
3 changes: 3 additions & 0 deletions .mps/modules.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.client.persistence/io.lionweb.mps.client.persistence.msd" folder="client" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.lang.runtime/io.lionweb.mps.converter.lang.runtime.msd" folder="lang.converter" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.disabled/io.lionweb.mps.converter.test.disabled.msd" folder="xx_broken" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.mpsextensions/io.lionweb.mps.converter.test.mpsextensions.msd" folder="test" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.support/io.lionweb.mps.converter.test.support.msd" folder="test" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.usebroken/io.lionweb.mps.converter.test.usebroken.msd" folder="test" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test/io.lionweb.mps.converter.test.msd" folder="test" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter/io.lionweb.mps.converter.msd" folder="lang.converter" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.json.test.support/io.lionweb.mps.json.test.support.msd" folder="test" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.json.test/io.lionweb.mps.json.test.msd" folder="test" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.json/io.lionweb.mps.json.msd" folder="lang.json" />
<modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.lang.test/io.lionweb.mps.lang.test.msd" folder="test" />
Expand Down
Loading
Loading