diff --git a/.github/workflows/external-pr.yml b/.github/workflows/external-pr.yml deleted file mode 100644 index e84ec19a7d3..00000000000 --- a/.github/workflows/external-pr.yml +++ /dev/null @@ -1,48 +0,0 @@ -name: Build External PR - -on: - pull_request: - paths-ignore: - - '**.md' - -env: - # Base for the PR - BASE_REPO: ${{ github.event.pull_request.base.repo.clone_url }} - - # Repository of PR - PR_HEAD_REPO: ${{ github.event.pull_request.head.repo.clone_url }} - -jobs: - build: - strategy: - matrix: - os: ['ubuntu-latest', 'macos-latest' ] # 'windows-latest' too flaky - fail-fast: false - runs-on: ${{ matrix.os }} - - steps: - - name: 'Check out repository' - uses: actions/checkout@v3 - if: ${{ env.BASE_REPO != env.PR_HEAD_REPO }} - - - name: 'Set up Java' - uses: actions/setup-java@v3 - with: - java-version: 17 - distribution: 'temurin' - if: ${{ env.BASE_REPO != env.PR_HEAD_REPO }} - - - name: 'Cache Maven packages' - uses: actions/cache@v3 - with: - path: ~/.m2 - key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml', '**/*.target') }} - restore-keys: ${{ runner.os }}-m2 - if: ${{ env.BASE_REPO != env.PR_HEAD_REPO }} - - - name: Build and test - uses: coactions/setup-xvfb@v1 - with: - run: mvn clean verify --show-version -PuseJenkinsSnapshots -Dsurefire.rerunFailingTestsCount=3 - working-directory: org.eclipse.xtext.full.releng - if: ${{ env.BASE_REPO != env.PR_HEAD_REPO }} diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e9dee451a1a..a46e96506a6 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -4,9 +4,13 @@ on: push: paths-ignore: - '**.md' + pull_request: + paths-ignore: + - '**.md' jobs: build: + if: github.event_name != 'pull_request' || github.event.pull_request.base.repo.clone_url != github.event.pull_request.head.repo.clone_url strategy: matrix: os: ['ubuntu-latest', 'macos-latest' ] # 'windows-latest' too flaky @@ -33,10 +37,11 @@ jobs: - name: Build and test uses: coactions/setup-xvfb@v1 with: - run: mvn clean verify --show-version -PuseJenkinsSnapshots -Dsurefire.rerunFailingTestsCount=3 + run: mvn clean verify -PuseJenkinsSnapshots working-directory: org.eclipse.xtext.full.releng build-maven-artifacts: + if: github.event_name != 'pull_request' || github.event.pull_request.base.repo.clone_url != github.event.pull_request.head.repo.clone_url runs-on: ubuntu-latest steps: @@ -57,5 +62,5 @@ jobs: restore-keys: ${{ runner.os }}-maven - name: Build Maven artifacts - run: mvn clean verify --show-version -PuseJenkinsSnapshots - working-directory: org.eclipse.xtext.maven.releng \ No newline at end of file + run: mvn clean verify -PuseJenkinsSnapshots + working-directory: org.eclipse.xtext.maven.releng diff --git a/.mvn/maven.config b/.mvn/maven.config new file mode 100644 index 00000000000..ae337b53145 --- /dev/null +++ b/.mvn/maven.config @@ -0,0 +1,3 @@ +--show-version +--update-snapshots +-Dsurefire.rerunFailingTestsCount=3 diff --git a/full-build.sh b/full-build.sh index cbd03a70bcc..8abfbe4e5ec 100755 --- a/full-build.sh +++ b/full-build.sh @@ -1,18 +1,6 @@ #!/usr/bin/env bash -if [ -z "$JENKINS_URL" ]; then - # if not set in environment use default - JENKINS_URL=https://ci.eclipse.org/xtext/ -fi -if [ -z "$WORKSPACE" ]; then - # if not set in environment use default - WORKSPACE=$(pwd) -fi - MVN_ARGS=(\ - --update-snapshots \ - -DJENKINS_URL=$JENKINS_URL \ - -DWORKSPACE=$WORKSPACE \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dit-archetype-tests-skip=true \ ) @@ -55,7 +43,6 @@ while [ "$1" != "" ]; do done MVN_ARGS+=(-PuseJenkinsSnapshots) -MVN_ARGS+=(-Dsurefire.rerunFailingTestsCount=3) echo mvn -B -f org.eclipse.xtext.full.releng ${MVN_ARGS[@]} $@ diff --git a/full-deploy.sh b/full-deploy.sh index 8e7cfc74323..ad193175649 100755 --- a/full-deploy.sh +++ b/full-deploy.sh @@ -1,18 +1,6 @@ #!/usr/bin/env bash -if [ -z "$JENKINS_URL" ]; then - # if not set in environment use default - JENKINS_URL=https://ci.eclipse.org/xtext/ -fi -if [ -z "$WORKSPACE" ]; then - # if not set in environment use default - WORKSPACE=$(pwd) -fi - MVN_ARGS=(\ - --update-snapshots \ - -DJENKINS_URL=$JENKINS_URL \ - -DWORKSPACE=$WORKSPACE \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dit-archetype-tests-skip=true \ ) diff --git a/maven-build.sh b/maven-build.sh index b3ef2269fae..db059b0a681 100755 --- a/maven-build.sh +++ b/maven-build.sh @@ -1,21 +1,9 @@ #!/usr/bin/env bash -if [ -z "$JENKINS_URL" ]; then - # if not set in environment use default - JENKINS_URL=https://ci.eclipse.org/xtext/ -fi -if [ -z "$WORKSPACE" ]; then - # if not set in environment use default - WORKSPACE=$(pwd) -fi - MVN_ARGS=(\ - --update-snapshots \ --fae \ -Dmaven.test.failure.ignore=true \ -Declipse.p2.mirrors=false \ - -DJENKINS_URL=$JENKINS_URL \ - -DWORKSPACE=$WORKSPACE \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ -Dit-archetype-tests-skip=true \ ) diff --git a/org.eclipse.xtend.maven.parent/pom.xml b/org.eclipse.xtend.maven.parent/pom.xml index bd0a0a73f33..c1d1584bb0b 100644 --- a/org.eclipse.xtend.maven.parent/pom.xml +++ b/org.eclipse.xtend.maven.parent/pom.xml @@ -33,8 +33,6 @@ 11 false - - https://ci.eclipse.org/xtext @@ -46,7 +44,7 @@ - + @@ -159,7 +157,7 @@ maven-source-plugin 3.2.1 - org.eclipse.m2e diff --git a/org.eclipse.xtext.maven.parent/pom.xml b/org.eclipse.xtext.maven.parent/pom.xml index 12119ed9ccd..d2319c53de3 100644 --- a/org.eclipse.xtext.maven.parent/pom.xml +++ b/org.eclipse.xtext.maven.parent/pom.xml @@ -24,7 +24,6 @@ ISO-8859-1 false - https://ci.eclipse.org/xtext @@ -131,7 +130,7 @@ maven-source-plugin 3.2.1 - org.eclipse.m2e diff --git a/pom.xml b/pom.xml index 474184b3ed6..d7cd5a86ec2 100644 --- a/pom.xml +++ b/pom.xml @@ -125,7 +125,7 @@ - ISO-8859-1 + ISO-8859-1 3.0.4 11 @@ -151,7 +151,6 @@ 2.31.0.M0 ${basedir}/.. - https://ci.eclipse.org/xtext xtext-latest @@ -280,7 +279,7 @@ lsp4j-from-jenkins - ${JENKINS_URL}/job/lsp4j/lastStableBuild/artifact/build/maven-repository + https://ci.eclipse.org/xtext/job/lsp4j/lastStableBuild/artifact/build/maven-repository @@ -582,7 +581,7 @@ org.apache.maven.plugins maven-javadoc-plugin - 3.5.0 diff --git a/releng/jenkins/sign-and-deploy/Jenkinsfile b/releng/jenkins/sign-and-deploy/Jenkinsfile index ce5b6fb02a1..6c5b4bfc7a9 100644 --- a/releng/jenkins/sign-and-deploy/Jenkinsfile +++ b/releng/jenkins/sign-and-deploy/Jenkinsfile @@ -101,7 +101,6 @@ pipeline { ./gradlew -info \ --warning-mode all \ --refresh-dependencies \ - -PJENKINS_URL=$JENKINS_URL \ -Posspub.userMavenSettings=/home/jenkins/.m2/settings.xml \ -Posspub.mavenSecurityFile=/home/jenkins/.m2/settings-security.xml \ -Posspub.version=$XTEXT_VERSION \ @@ -117,7 +116,7 @@ pipeline { } // END dir } } - + stage('Deploy to Eclipse project storage') { steps { dir('publishing') { @@ -134,7 +133,7 @@ pipeline { S) ZIP_NAME=tmf-xtext-Update-$XTEXT_VERSION.zip ;; R) ZIP_NAME=tmf-xtext-Update-$VERSION.zip ;; esac - + # # STEP 2: Zip the repository # @@ -142,10 +141,10 @@ pipeline { zip -r $WORKSPACE/publishing/build-result/downloads/$ZIP_NAME . md5sum --binary $WORKSPACE/publishing/build-result/downloads/$ZIP_NAME > $WORKSPACE/publishing/build-result/downloads/$ZIP_NAME.md5 cd $WORKSPACE/publishing - + ''' } // END dir - + sshagent(['projects-storage.eclipse.org-bot-ssh']) { dir('publishing') { sh ''' @@ -163,7 +162,7 @@ pipeline { S) ZIP_NAME=tmf-xtext-Update-$XTEXT_VERSION.zip ;; R) ZIP_NAME=tmf-xtext-Update-$VERSION.zip ;; esac - + # # STEP 3: Upload zip und .md5 # @@ -171,7 +170,7 @@ pipeline { # ensure target directory exists ssh genie.xtext@projects-storage.eclipse.org "mkdir -p $TARGET_DROP_PATH" scp $WORKSPACE/publishing/build-result/downloads/$ZIP_NAME $WORKSPACE/publishing/build-result/downloads/$ZIP_NAME.md5 genie.xtext@projects-storage.eclipse.org:$TARGET_DROP_PATH - + # # STEP 4: Unpack zip to p2 repository location # diff --git a/tycho-sign.sh b/tycho-sign.sh index 1929a9b0e42..13613992b51 100755 --- a/tycho-sign.sh +++ b/tycho-sign.sh @@ -1,8 +1,3 @@ -if [ -z "$JENKINS_URL" ]; then - # if not set in environment use default - JENKINS_URL=https://ci.eclipse.org/xtext/ -fi - # THIS SIGNS, SKIPPING TESTS mvn \ @@ -11,8 +6,6 @@ mvn \ -P useJenkinsSnapshots \ -P eclipse-sign \ --batch-mode \ - --update-snapshots \ -Dmaven.repo.local=.m2/repository \ - -DJENKINS_URL=$JENKINS_URL \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ $@ \ No newline at end of file diff --git a/tycho-test.sh b/tycho-test.sh index adaa476a03e..26835aad429 100755 --- a/tycho-test.sh +++ b/tycho-test.sh @@ -1,8 +1,4 @@ #!/usr/bin/env bash -if [ -z "$JENKINS_URL" ]; then - # if not set in environment use default - JENKINS_URL=https://ci.eclipse.org/xtext/ -fi # Use TARGET_PLATFORM from environment and 'r202203' as default. # Overridable by 'tp' command-line arg @@ -11,9 +7,7 @@ if [ -z "$TARGET_PLATFORM" ]; then fi MVN_ARGS=(\ - --update-snapshots \ --fae \ - -DJENKINS_URL=$JENKINS_URL \ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \ )