diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eefcc85..2aef462 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,15 +18,7 @@ jobs: distribution: adopt java-version: 8 - - uses: actions/cache@v2 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Build - run: | - ./gradlew --continue --stacktrace + uses: gradle/gradle-build-action@v2 + with: + arguments: "--continue --stacktrace" diff --git a/DEV.md b/DEV.md index 50f5f6b..1b4dc5a 100644 --- a/DEV.md +++ b/DEV.md @@ -3,23 +3,14 @@ Development ## Build and release -### Build local p2 repo +### Build beta ```bash ./gradlew updateSiteZip --stacktrace ``` -### Build beta to Bintray +### Build release ```bash -export BINTRAY_USER={your_bintray_user} -export BINTRAY_API_KEY={your_bintray_api_key} - -./gradlew updateSiteZip publishP2Repo --stacktrace -``` - -### Build release to Bintray - -```bash -./gradlew updateSiteZip publishP2Repo -DBINTRAY_USER={your_bintray_user} -DBINTRAY_API_KEY={your_bintray_api_key} -DBUILD_MODE=release +./gradlew clean updateSiteZip -DBUILD_MODE=release ``` diff --git a/build.gradle b/build.gradle index 8468d72..e247da1 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,6 @@ buildscript { } dependencies { classpath 'org.standardout:bnd-platform:1.7.0' - classpath 'com.github.missedone:gradle-bintray-p2-plugin:1.2.0' } } @@ -19,7 +18,6 @@ def buildTime() { } apply plugin: 'org.standardout.bnd-platform' -apply plugin: 'bintray-p2' repositories { mavenCentral() @@ -31,7 +29,7 @@ repositories { // project version is also platform feature version default, // here uses TestNG version as project version. -version = '7.4.0' +version = '7.5' def buildMode = System.getProperty('BUILD_MODE') def versionWithQualifier @@ -113,14 +111,7 @@ platform { defaultQualifier '' downloadsDir = new File(System.properties['user.home'], '.bnd-eclipse') -} - -publishP2Repo { - repoOwner = 'testng-team' - repoName = buildMode == 'release' ? 'testng-p2-release' : 'testng-p2' - mainFeatureId = 'org.testng.p2.feature' - compositePackage = '' - subCompositeStrategy = 'MICRO' + eclipseMirror = 'http://philippkatz.de/eclipse-p2-minimal.tar.gz' } task wrapper(type: Wrapper) { diff --git a/dist/eclipse-p2-minimal.tar.gz b/dist/eclipse-p2-minimal.tar.gz new file mode 100644 index 0000000..e69de29