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

Housekeeping #3

Merged
merged 62 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
31e5943
Updated build action versions
arminzavada Sep 14, 2024
355a5e6
Added dependabot versions
arminzavada Sep 14, 2024
2bb0aa6
Added executable flag to gradlew runner
arminzavada Sep 14, 2024
8a9a55c
Added REUSE check
arminzavada Sep 14, 2024
859481e
Updated Gradle
arminzavada Sep 14, 2024
e1b0a9b
Enabled parallel task execution and config cache
arminzavada Sep 14, 2024
cd454e7
Added oxsts.lang.ide directory
arminzavada Sep 14, 2024
85ee44e
Removed redundant kotlin jvmToolchain setup
arminzavada Sep 14, 2024
5794300
Removed dependsOn calls
arminzavada Sep 14, 2024
aa62311
Removed wrapper configuration
arminzavada Sep 14, 2024
986a94c
Added missing license headers
arminzavada Sep 14, 2024
557936d
Added matrix build
arminzavada Sep 14, 2024
5ad62ec
Turned on gradle daemon
arminzavada Sep 14, 2024
20a5506
Removed ARM macos
arminzavada Sep 14, 2024
89e4e81
Removed fail-fast on strategy
arminzavada Sep 14, 2024
4c3ffe3
Skip MacOS build for now
arminzavada Sep 14, 2024
01e1187
Removed spaces from directory names
arminzavada Sep 14, 2024
17cb5f5
Refactored Theta runner to use docker image instead of downloaded jars
arminzavada Sep 14, 2024
16fd6fa
Added additional logging to theta result handling.
arminzavada Sep 14, 2024
7ec431f
Fix?
arminzavada Sep 14, 2024
9adaf30
Added initialization step
arminzavada Sep 14, 2024
8c8cbf1
Renamed /host to /theta in docker container
arminzavada Sep 14, 2024
ea53fb3
Implemented correct cancellation of theta executor coroutines
arminzavada Sep 14, 2024
59bef2b
Always destroy the theta docker container after execution
arminzavada Sep 14, 2024
fd31570
Increased theta execution timeout to 5 minutes
arminzavada Sep 14, 2024
39b8c81
Changed from --mount to -v
arminzavada Sep 14, 2024
711e496
Extracted dependency submission from main build to only execute it on…
arminzavada Sep 14, 2024
f4ad65c
Turn off windows until WSL2 is installed on Github Actions Windows ru…
arminzavada Sep 14, 2024
7d2fe29
Using docker-java client to run docker containers
arminzavada Sep 24, 2024
3c06226
Added license header
arminzavada Sep 24, 2024
768c02c
Added license header
arminzavada Sep 24, 2024
6eac893
Try matrix build
arminzavada Sep 24, 2024
911d89f
Install docker on macos-13
arminzavada Sep 24, 2024
164ef34
Change to macos-latest
arminzavada Sep 24, 2024
c78e9ba
Test docker
arminzavada Sep 24, 2024
064e96b
Removed eclipse convention plugin
arminzavada Sep 24, 2024
df2622c
Install and test docker
arminzavada Sep 24, 2024
3d2bf3b
Install docker with --cask option
arminzavada Sep 24, 2024
0282b4e
Try using buildx
arminzavada Sep 24, 2024
6c665b9
Try using buildx@v3
arminzavada Sep 24, 2024
cea50a3
Try using colima and docker
arminzavada Sep 24, 2024
7d0d080
Try starting colima service
arminzavada Sep 24, 2024
2acd39f
Try using setup-docker action
arminzavada Sep 25, 2024
bac3ea3
Downgrade to macos-13
arminzavada Sep 25, 2024
6bce331
Reordered build steps
arminzavada Sep 25, 2024
6e23837
Restructured project
arminzavada Sep 25, 2024
b40dc7a
Restructured project
arminzavada Sep 25, 2024
ca74278
Run code reformat
arminzavada Sep 25, 2024
0317da3
Renamed engine to compiler
arminzavada Sep 25, 2024
64b1ce6
Disabled macos-13 build
arminzavada Sep 26, 2024
f808b7c
Added log4j configuration
arminzavada Sep 26, 2024
f4b6424
Refactored project dependencies
arminzavada Sep 26, 2024
b3d341d
Updated versions
arminzavada Sep 26, 2024
4331bf5
Increased test timeout
arminzavada Sep 26, 2024
2a24e69
Removed exitCode from result
arminzavada Sep 26, 2024
ac78624
Handle multiple job failure
arminzavada Sep 26, 2024
22f5e11
Added supervisorScope to separate async jobs from each other
arminzavada Sep 26, 2024
50701c9
Added PRED-CART and default Theta job
arminzavada Sep 26, 2024
78e8153
Lifted supervisor scope up to the function level
arminzavada Sep 30, 2024
ce9bc9b
Refactored theta execution
arminzavada Sep 30, 2024
d760373
Spacecraft_batteryCharge_50 case usually times out
arminzavada Sep 30, 2024
d6358f2
Decreased timeout
arminzavada Sep 30, 2024
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
16 changes: 16 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# SPDX-FileCopyrightText: 2023-2024 The Semantifyr Authors
#
# SPDX-License-Identifier: EPL-2.0

version: 2
updates:
- package-ecosystem: "gradle"
directory: "/"
schedule:
interval: "weekly"
rebase-strategy: "disabled"
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
rebase-strategy: "disabled"
57 changes: 57 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# SPDX-FileCopyrightText: 2023-2024 The Semantifyr Authors
#
# SPDX-License-Identifier: EPL-2.0

name: Continuous Integration
on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
jobs:
build:
permissions:
contents: read
strategy:
fail-fast: false
matrix:
os:
- ubuntu-latest
# - macos-13
runs-on: ${{ matrix.os }}
steps:
# - name: Setup Docker on MacOS
# uses: douglascamata/setup-docker-macos-action@v1-alpha
# if: ${{ matrix.os == 'macos-13' }}
- name: Test Docker
run: docker run hello-world
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: 17
distribution: adopt
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
- name: Checkout code
uses: actions/checkout@v4
- name: Gradle build
run: ./gradlew build
- name: Upload Artifacts
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: actions/upload-artifact@v4
with:
path: |
**/build/distributions/
**/build/reports/
**/build/test-results/

reuse-check:
name: REUSE Compliance Check
permissions:
contents: read
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: REUSE Compliance Check
uses: fsfe/reuse-action@v4
22 changes: 22 additions & 0 deletions .github/workflows/dependency.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
# SPDX-FileCopyrightText: 2023-2024 The Semantifyr Authors
#
# SPDX-License-Identifier: EPL-2.0

name: Dependency Submission
on:
push:
branches: [ 'main' ]
permissions:
contents: write
jobs:
dependency-submission:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17

- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v4
52 changes: 0 additions & 52 deletions .github/workflows/gradle.yml

This file was deleted.

11 changes: 0 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,6 @@
# SPDX-License-Identifier: EPL-2.0

*._trace
/**/.classpath
.idea/
.gradle/
/**/.project
/**/.settings
/**/bin/
/**/build/

/**/emf-gen/
/**/xtend-gen/
/**/src-gen/
/**/*.xtendbin
/**/xtext-gen/
/oxsts.lang.ide/
Empty file added CONTRIBUTING.md
Empty file.
14 changes: 0 additions & 14 deletions build.gradle.kts

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
package hu.bme.mit.semantifyr.gradle.conventions

import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.tasks.testing.logging.TestExceptionFormat

plugins {
`java-library`
`java-test-fixtures`
jacoco
java
id("hu.bme.mit.semantifyr.gradle.eclipse")
}

repositories {
Expand All @@ -29,7 +29,6 @@ dependencies {
testFixturesApi(libs.mockito.junit)

testRuntimeOnly(libs.junit.engine)
testRuntimeOnly("org.junit.platform:junit-platform-launcher")
}

java.toolchain {
Expand All @@ -45,6 +44,7 @@ tasks {
minHeapSize = "512m"
maxHeapSize = "4G"
testLogging.showStandardStreams = true
testLogging.exceptionFormat = TestExceptionFormat.FULL

finalizedBy(tasks.jacocoTestReport)
}
Expand All @@ -60,29 +60,6 @@ tasks {
}

jacocoTestReport {
dependsOn(tasks.test)
reports {
xml.required.set(true)
}
}

jar {
manifest {
attributes(
"Bundle-SymbolicName" to "${project.group}.${project.name}",
"Bundle-Version" to project.version,
)
}
}

val generateEclipseSourceFolders by tasks.registering

register("prepareEclipse") {
dependsOn(generateEclipseSourceFolders)
dependsOn(tasks.named("eclipseJdt"))
}

eclipseClasspath {
dependsOn(generateEclipseSourceFolders)
inputs.files(test.get().outputs)
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,3 @@ val libs = the<LibrariesForLibs>()
dependencies {
mwe2(libs.mwe2.launch)
}

eclipse.classpath.plusConfigurations += mwe2
71 changes: 0 additions & 71 deletions engine/build.gradle.kts

This file was deleted.

Loading