Skip to content

GitLab

Commit 6778fa83 authored by Alexander Weigl's avatar Alexander Weigl
Browse files

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	rt/src/main/java/edu/kit/iti/formal/psdbg/interpreter/dbg/Breakpoint.java
#	ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controller/DebuggerMain.java
#	ui/src/main/java/edu/kit/iti/formal/psdbg/gui/controls/ProofTree.java
parents fe351689 6ddf4f97
Pipeline #15116 passed with stages
in 6 minutes and 48 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 167 deletions
.gitlab-ci.yml
View file @ 6778fa83
image: key-ant-openjdk-8:latest
cache:
paths:
- .m2/
variables:
MAVEN_OPTS: -Dmaven.repo.local=${CI_PROJECT_DIR}/.m2
MAVEN_OPTS: >-
-Dmaven.repo.local=${CI_PROJECT_DIR}/.m2
-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN
-Dorg.slf4j.simpleLogger.showDateTime=true
GIT_SSL_NO_VERIFY: "true"
stages:
- setup
- build
- test
- deploy
setup:
stage: setup
script:
- COMPONENTS=keydeps/lib/components/
- GID=key-project-psdbg
- V=2.7-SNAPSHOT
- mvn install:install-file -Dfile=$COMPONENTS/key.core.jar -DartifactId=key.core -DgroupId=$GID -Dversion=$V -Dpackaging=jar
- mvn install:install-file -Dfile=$COMPONENTS/key.ui.jar -DartifactId=key.ui -DgroupId=$GID -Dversion=$V -Dpackaging=jar
- mvn install:install-file -Dfile=$COMPONENTS/key.util.jar -DartifactId=key.util -DgroupId=$GID -Dversion=$V -Dpackaging=jar
- mvn install:install-file -Dfile=$COMPONENTS/../libs/recoderKey.jar -DartifactId=recoder -DgroupId=$GID -Dversion=2.7 -Dpackaging=jar
build:
stage: build
script: "mvn compile -B -T 2"
test:
test:
stage: test
script: "mvn test -B"
deploy:
stage: deploy
script:
- "mvn package site:site -DperformRelease=true -DcreateChecksum=true -DskipTests=true -B"
- "mvn package -DperformRelease=true -DcreateChecksum=true -DskipTests=true -B"
artifacts:
paths:
- target/*jar
- target/site/*
- "*/target/*.jar"
allow_failure: true
site:
stage: deploy
script:
- "mvn site:site -DskipTests=true -B"
artifacts:
paths:
- "*/target/site/*"
allow_failure: true
\ No newline at end of file
TempJars/key.core/2.7-SNAPSHOT/_remote.repositories deleted 100644 → 0
View file @ fe351689
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Tue Sep 12 15:15:02 CEST 2017
key.core-2.7-SNAPSHOT.jar>=
key.core-2.7-SNAPSHOT.pom>=
TempJars/key.core/2.7-SNAPSHOT/key.core-2.7-SNAPSHOT.pom deleted 100644 → 0
View file @ fe351689
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>key-project-psdbg</groupId>
<artifactId>key.core</artifactId>
<version>2.7-SNAPSHOT</version>
<description>POM was created from install:install-file</description>
</project>
TempJars/key.core/2.7-SNAPSHOT/maven-metadata-local.xml deleted 100644 → 0
View file @ fe351689
<?xml version="1.0" encoding="UTF-8"?>
<metadata modelVersion="1.1.0">
<groupId>key-project-psdbg</groupId>
<artifactId>key.core</artifactId>
<version>2.7-SNAPSHOT</version>
<versioning>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<lastUpdated>20170912131502</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>2.7-SNAPSHOT</value>
<updated>20170912131502</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>2.7-SNAPSHOT</value>
<updated>20170912103035</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
</metadata>
TempJars/key.core/2.7-SNAPSHOT/resolver-status.properties deleted 100644 → 0
View file @ fe351689
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Thu Oct 05 13:51:55 CEST 2017
maven-metadata-local-repo.xml.lastUpdated=1507204315285
maven-metadata-local-repo.xml.error=
TempJars/key.core/2.7/key.core-2.7.pom.lastUpdated deleted 100644 → 0
View file @ fe351689
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Thu Oct 05 13:55:20 CEST 2017
@default-local-repo-file\:///${basedir}/local-repo/.lastUpdated=1507204520445
file\:///${basedir}/local-repo/.error=Could not transfer artifact key-project-psdbg\:key.core\:pom\:2.7 from/to local-repo (file\:///${basedir}/local-repo)\: Repository path /${basedir}/local-repo does not exist, and cannot be created.
@default-central-https\://repo.maven.apache.org/maven2/.lastUpdated=1507204520431
https\://repo.maven.apache.org/maven2/.error=Could not transfer artifact key-project-psdbg\:key.core\:pom\:2.7 from/to central (https\://repo.maven.apache.org/maven2)\: Connect to repo.maven.apache.org\:443 [repo.maven.apache.org/151.101.120.215] failed\: Connection timed out (Connection timed out)
TempJars/key.core/maven-metadata-local.xml deleted 100644 → 0
View file @ fe351689
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>key-project-psdbg</groupId>
<artifactId>key.core</artifactId>
<versioning>
<versions>
<version>2.7-SNAPSHOT</version>
</versions>
<lastUpdated>20170912131502</lastUpdated>
</versioning>
</metadata>
TempJars/key.ui/2.7-SNAPSHOT/_remote.repositories deleted 100644 → 0
View file @ fe351689
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Tue Sep 12 15:15:04 CEST 2017
key.ui-2.7-SNAPSHOT.jar>=
key.ui-2.7-SNAPSHOT.pom>=
TempJars/key.ui/2.7-SNAPSHOT/key.ui-2.7-SNAPSHOT.pom deleted 100644 → 0
View file @ fe351689
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>key-project-psdbg</groupId>
<artifactId>key.ui</artifactId>
<version>2.7-SNAPSHOT</version>
<description>POM was created from install:install-file</description>
</project>
TempJars/key.ui/2.7-SNAPSHOT/maven-metadata-local.xml deleted 100644 → 0
View file @ fe351689
<?xml version="1.0" encoding="UTF-8"?>
<metadata modelVersion="1.1.0">
<groupId>key-project-psdbg</groupId>
<artifactId>key.ui</artifactId>
<version>2.7-SNAPSHOT</version>
<versioning>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<lastUpdated>20170912131504</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>2.7-SNAPSHOT</value>
<updated>20170912131504</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>2.7-SNAPSHOT</value>
<updated>20170912103037</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
</metadata>
TempJars/key.ui/2.7-SNAPSHOT/resolver-status.properties deleted 100644 → 0
View file @ fe351689
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Thu Oct 05 13:51:55 CEST 2017
maven-metadata-local-repo.xml.lastUpdated=1507204315300
maven-metadata-local-repo.xml.error=
TempJars/key.ui/2.7/key.ui-2.7.pom.lastUpdated deleted 100644 → 0
View file @ fe351689
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Thu Oct 05 13:57:27 CEST 2017
@default-local-repo-file\:///${basedir}/local-repo/.lastUpdated=1507204647790
file\:///${basedir}/local-repo/.error=Could not transfer artifact key-project-psdbg\:key.ui\:pom\:2.7 from/to local-repo (file\:///${basedir}/local-repo)\: Repository path /${basedir}/local-repo does not exist, and cannot be created.
@default-central-https\://repo.maven.apache.org/maven2/.lastUpdated=1507204647788
https\://repo.maven.apache.org/maven2/.error=Could not transfer artifact key-project-psdbg\:key.ui\:pom\:2.7 from/to central (https\://repo.maven.apache.org/maven2)\: Connect to repo.maven.apache.org\:443 [repo.maven.apache.org/151.101.120.215] failed\: Connection timed out (Connection timed out)
TempJars/key.ui/maven-metadata-local.xml deleted 100644 → 0
View file @ fe351689
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>key-project-psdbg</groupId>
<artifactId>key.ui</artifactId>
<versioning>
<versions>
<version>2.7-SNAPSHOT</version>
</versions>
<lastUpdated>20170912131504</lastUpdated>
</versioning>
</metadata>
TempJars/key.util/2.7-SNAPSHOT/_remote.repositories deleted 100644 → 0
View file @ fe351689
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Tue Sep 12 15:15:07 CEST 2017
key.util-2.7-SNAPSHOT.jar>=
key.util-2.7-SNAPSHOT.pom>=
TempJars/key.util/2.7-SNAPSHOT/key.util-2.7-SNAPSHOT.pom deleted 100644 → 0
View file @ fe351689
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>key-project-psdbg</groupId>
<artifactId>key.util</artifactId>
<version>2.7-SNAPSHOT</version>
<description>POM was created from install:install-file</description>
</project>
TempJars/key.util/2.7-SNAPSHOT/maven-metadata-local.xml deleted 100644 → 0
View file @ fe351689
<?xml version="1.0" encoding="UTF-8"?>
<metadata modelVersion="1.1.0">
<groupId>key-project-psdbg</groupId>
<artifactId>key.util</artifactId>
<version>2.7-SNAPSHOT</version>
<versioning>
<snapshot>
<localCopy>true</localCopy>
</snapshot>
<lastUpdated>20170912131507</lastUpdated>
<snapshotVersions>
<snapshotVersion>
<extension>jar</extension>
<value>2.7-SNAPSHOT</value>
<updated>20170912131507</updated>
</snapshotVersion>
<snapshotVersion>
<extension>pom</extension>
<value>2.7-SNAPSHOT</value>
<updated>20170912103039</updated>
</snapshotVersion>
</snapshotVersions>
</versioning>
</metadata>
TempJars/key.util/2.7-SNAPSHOT/resolver-status.properties deleted 100644 → 0
View file @ fe351689
#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
#Thu Oct 05 13:51:55 CEST 2017
maven-metadata-local-repo.xml.lastUpdated=1507204315304
maven-metadata-local-repo.xml.error=
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment