Ver código fonte

remove scripting that's used only during deployment to Bintray

Stephen Gold 4 anos atrás
pai
commit
abe7f38cc8

+ 0 - 35
.github/actions/tools/bintray.sh

@@ -1,40 +1,5 @@
 #!/bin/bash
 
-# bintray_createPackage [REPO] [PACKAGE] [USER] [PASSWORD] [GIT REPO] [LICENSE]
-function bintray_createPackage {
-    repo="$1"
-    package="$2"
-    user="$3"
-    password="$4"
-    srcrepo="$5"
-    license="$6"
-
-    repoUrl="https://api.bintray.com/packages/$repo"
-    if [ "`curl -u$user:$password -H Content-Type:application/json -H Accept:application/json \
-    --write-out %{http_code} --silent --output /dev/null -X GET \"$repoUrl/$package\"`" != "200" ];
-    then
-
-        if [ "$srcrepo" != "" -a "$license" != "" ];
-        then 
-            echo "Package does not exist... create."
-            data="{
-                \"name\": \"${package}\",
-                \"labels\": [],
-                \"licenses\": [\"${license}\"],
-                \"vcs_url\": \"${srcrepo}\"
-            }"
-     
-
-            curl -u$user:$password -H "Content-Type:application/json" -H "Accept:application/json" -X POST \
-                -d "${data}" "$repoUrl"
-        else
-            echo "Package does not exist... you need to specify a repo and license for it to be created."
-        fi
-    else    
-        echo "The package already exists. Skip."
-    fi
-}
-
 # minio_uploadFile <LOCAL_FILEPATH> <REMOTE_FILEPATH> <MINIO_URL> <MINIO_ACCESS_KEY> <MINIO_SECRET_KEY>
 #
 # Upload the specified file to the specified MinIO instance.

+ 1 - 30
.github/actions/tools/uploadToMaven.sh

@@ -2,16 +2,10 @@
 #############################################
 #
 # Usage
-#       uploadAllToMaven path/of/dist/maven https://api.bintray.com/maven/riccardo/sandbox-maven/ riccardo $BINTRAY_PASSWORD gitrepo license
-#           Note: gitrepo and license are needed only when uploading to bintray if you want to create missing packages automatically
-#                   gitrepo must be a valid source repository
-#                   license must be a license supported by bintray eg "BSD 3-Clause"
-#   or
-#       uploadAllToMaven path/of/dist/maven $GITHUB_PACKAGE_REPOSITORY user password
+#   uploadAllToMaven path/of/dist/maven $GITHUB_PACKAGE_REPOSITORY user password
 #
 #############################################
 root="`dirname  ${BASH_SOURCE[0]}`"
-source $root/bintray.sh
 
 set -e
 function uploadToMaven {
@@ -34,29 +28,6 @@ function uploadToMaven {
         auth="-H \"Authorization: token $password\""
     fi
 
-    
-    if [[ $repourl == https\:\/\/api.bintray.com\/* ]]; 
-    then 
-        package="`dirname $destfile`"
-        version="`basename $package`"
-        package="`dirname $package`"
-        package="`basename $package`"
-
-        if [ "$user" = "" -o "$password" = "" ];
-        then
-            echo "Error! You need username and password to upload to bintray"
-             exit 1
-        fi
-        echo "Detected bintray"
-
-        bintrayRepo="${repourl/https\:\/\/api.bintray.com\/maven/}"   
-        echo "Create package on $bintrayRepo"
-
-        bintray_createPackage $bintrayRepo $package $user $password $srcrepo $license  
-        
-        repourl="$repourl/$package"    
-    fi
-
     cmd="curl -T \"$file\" $auth \
         \"$repourl/$destfile\" \
         -vvv"

+ 1 - 19
.github/workflows/main.yml

@@ -5,7 +5,7 @@
 #   - Build natives for android
 #   - Merge the natives, build the engine, create the zip release, maven artifacts, javadoc and native snapshot
 #   - (only when native code changes) Deploy the natives snapshot to the MinIO instance
-#   - (only when building a release) Deploy everything else to github releases, github packet registry, Bintray, and Sonatype
+#   - (only when building a release) Deploy everything else to github releases and Sonatype
 #   - (only when building a release) Update javadoc.jmonkeyengine.org
 # Note:
 #   All the actions/upload-artifact and actions/download-artifact steps are used to pass
@@ -13,13 +13,6 @@
 #   running workflow, we use it to store the result of each job since the filesystem
 #   is not maintained between jobs.
 ################# CONFIGURATIONS #####################################################
-# >> Configure BINTRAY RELEASE
-#   Configure the following secrets/variables (customize the values with your own)
-#     BINTRAY_GENERIC_REPO=riccardoblsandbox/jmonkeyengine-files
-#     BINTRAY_MAVEN_REPO=riccardoblsandbox/jmonkeyengine
-#     BINTRAY_USER=riccardo
-#     BINTRAY_APIKEY=XXXXXX
-#     BINTRAY_LICENSE="BSD 3-Clause"
 # >> Configure MINIO NATIVES SNAPSHOT
 #     OBJECTS_KEY=XXXXXX
 # >> Configure SONATYPE RELEASE
@@ -358,17 +351,6 @@ jobs:
           --data-binary @"$filename" \
           "$url"
 
-      - name: Deploy to bintray
-        run: |
-          source .github/actions/tools/uploadToMaven.sh
-          if [ "${{ secrets.BINTRAY_MAVEN_REPO }}" = "" ];
-          then
-            echo "Configure the following secrets to enable bintray deployment"
-            echo "BINTRAY_MAVEN_REPO, BINTRAY_USER, BINTRAY_APIKEY"
-          else
-            uploadAllToMaven dist/maven/ https://api.bintray.com/maven/${{ secrets.BINTRAY_MAVEN_REPO }} ${{ secrets.BINTRAY_USER }} ${{ secrets.BINTRAY_APIKEY }} "https://github.com/${GITHUB_REPOSITORY}" "${{ secrets.BINTRAY_LICENSE }}"
-          fi
-
       # - name: Deploy to github package registry
       #   run: |
       #     source .github/actions/tools/uploadToMaven.sh

+ 0 - 29
bintray.gradle

@@ -1,29 +0,0 @@
-//
-// This file is to be applied to some subproject.
-//
-
-apply plugin: 'com.jfrog.bintray'
-
-bintray {
-    user = bintray_user
-    key = bintray_api_key
-    configurations = ['archives']
-    dryRun = false 
-    pkg {
-        repo = 'org.jmonkeyengine'
-        userOrg = 'jmonkeyengine'
-        name = project.name
-        desc = POM_DESCRIPTION
-        websiteUrl = POM_URL
-        licenses = ['BSD New']
-        vcsUrl = POM_SCM_URL
-        labels = ['jmonkeyengine']
-    }
-}
-
-bintrayUpload.dependsOn(writeFullPom)
-
-bintrayUpload.onlyIf {
-    (bintray_api_key.length() > 0) &&
-    !(version ==~ /.*SNAPSHOT/)
-}

+ 0 - 4
build.gradle

@@ -12,7 +12,6 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
         classpath 'me.tatarka:gradle-retrolambda:3.7.1'
         classpath "gradle.plugin.com.github.spotbugs.snom:spotbugs-gradle-plugin:4.5.1"
     }
@@ -39,9 +38,6 @@ apply plugin: 'me.tatarka.retrolambda'
 subprojects {
     if(!project.name.equals('jme3-android-examples')) {
         apply from: rootProject.file('common.gradle')
-        if (!project.name.equals('jme3-testdata')) {
-            apply from: rootProject.file('bintray.gradle')
-        }
     } else {
         apply from: rootProject.file('common-android-app.gradle')
     }

+ 0 - 4
gradle.properties

@@ -42,8 +42,4 @@ POM_LICENSE_URL=http://opensource.org/licenses/BSD-3-Clause
 POM_LICENSE_DISTRIBUTION=repo
 POM_INCEPTION_YEAR=2009
 
-# Bintray settings to override in $HOME/.gradle/gradle.properties or ENV or commandline
-bintray_user=
-bintray_api_key=
-
 PREBUILD_NATIVES_URL=https://objects.jmonkeyengine.org/native-snapshots/${natives.snapshot}/jme3-natives.zip