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

feat: update to testng 7.5 #39

Merged
merged 5 commits into from
Jan 7, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 3 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
15 changes: 3 additions & 12 deletions DEV.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
13 changes: 2 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}
}

Expand All @@ -19,7 +18,6 @@ def buildTime() {
}

apply plugin: 'org.standardout.bnd-platform'
apply plugin: 'bintray-p2'

repositories {
mavenCentral()
Expand All @@ -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
Expand Down Expand Up @@ -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) {
Expand Down
Empty file added dist/eclipse-p2-minimal.tar.gz
Empty file.