Merge pull request #94 from Backblaze/kyle/artifactory

rhryckewicz · web-flow · commit 897f02882c3d · 2024-12-18T13:44:43.000-05:00
Configure to deploy to Artifactory and cleanup GitHub Actions configs
diff --git a/.github/workflows/.ci_cd.yml b/.github/workflows/.ci_cd.yml
@@ -14,8 +14,6 @@ env:
   OUTPUT_DIR: $GITHUB_WORKSPACE/build/outputs
   OUTPUT_ZIP: b2-sdk-build-${GITHUB_RUN_NUMBER}.zip
   BUILD_NUMBER: ${{ github.run_number }}
-  # This token was generated under rhryckewicz account
-  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
   # These are stored in Bitwarden
   B2_ACCOUNT_ID: ${{ secrets.B2_ACCOUNT_ID }}
   B2_UPLOAD_BUCKET: ${{ secrets.B2_UPLOAD_BUCKET }}
@@ -25,26 +23,26 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Use jdk8
-        uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '8'
-          cache: 'gradle'
+          distribution: 'temurin'
+          java-version: '11'
+
+      - uses: gradle/actions/wrapper-validation@v4
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
-      - uses: gradle/wrapper-validation-action@v1
       - name: Set up Python ${{ env.PYTHON_DEFAULT_VERSION }}
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_DEFAULT_VERSION }}
 
       - name: Install dependencies
         run: |
-          mkdir -p ~/.gradle && echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
           # upgrade pip and setuptools so that b2 CLI can be properly installed
           python -m pip install --upgrade pip setuptools
           python -m pip install b2
@@ -66,18 +64,13 @@ jobs:
 
       - name: Deploy to internal Maven repo
         if: github.ref == 'refs/heads/master' && github.repository == 'Backblaze/b2-sdk-java-private'
-        run: $GITHUB_WORKSPACE/gradlew publishMavenPublicationToBzGithubPackagesRepository
+        run: $GITHUB_WORKSPACE/gradlew publishMavenPublicationToBzArtifactoryRepository publishMavenPublicationToBzGithubPackagesRepository
         env:
+          ORG_GRADLE_PROJECT_bzArtifactoryUsername: ${{ secrets.ARTIFACTORY_USERNAME }}
+          ORG_GRADLE_PROJECT_bzArtifactoryPassword: ${{ secrets.ARTIFACTORY_TOKEN }}
           ORG_GRADLE_PROJECT_bzGithubPackagesUsername: ${{ secrets.PACKAGES_USERNAME }}
           ORG_GRADLE_PROJECT_bzGithubPackagesPassword: ${{ secrets.PACKAGES_TOKEN }}
 
-      - name: Cleanup Gradle Cache
-        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
-        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
-        run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -fr ~/.gradle/caches/*/plugin-resolution/
-
       - name: Upload to b2
         if: github.ref == 'refs/heads/master'
         # upload to b2 (if credentials are provided, as they will be for backblaze's builds, but not pull requests)
@@ -86,16 +79,16 @@ jobs:
 
       - name: Check GitHub Pages status
         if: github.ref == 'refs/heads/master'
-        uses: crazy-max/ghaction-github-status@v2
+        uses: crazy-max/ghaction-github-status@v4
         with:
           pages_threshold: major_outage
 
-      - name: Deploy
+      - name: Deploy Javadoc
         # note that i'm only uploading the javadocs for b2-sdk-core.
         # that's because i'm lame and building separate javadocs for
         # each jar and only uploading one set of javadocs.
         if: github.ref == 'refs/heads/master' && success()
-        uses: crazy-max/ghaction-github-pages@v2
+        uses: crazy-max/ghaction-github-pages@v3
         with:
           target_branch: gh-pages
           build_dir: core/build/docs/javadoc
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -12,18 +12,19 @@ jobs:
     if: github.repository == 'Backblaze/b2-sdk-java'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Use jdk8
-        uses: actions/setup-java@v2
+      - uses: actions/setup-java@v4
         with:
-          distribution: 'adopt'
-          java-version: '8'
-          cache: 'gradle'
+          distribution: 'temurin'
+          java-version: '11'
+
+      - uses: gradle/actions/wrapper-validation@v4
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
 
-      - uses: gradle/wrapper-validation-action@v1
       - name: Deploy to Maven Central
         run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository createBundle --no-daemon --stacktrace
         env:
@@ -33,21 +34,15 @@ jobs:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
 
-      - name: Cleanup Gradle Cache
-        # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.
-        # Restoring these files from a GitHub Actions cache might cause problems for future builds.
-        run: |
-          rm -f ~/.gradle/caches/modules-2/modules-2.lock
-          rm -fr ~/.gradle/caches/*/plugin-resolution/
-
       - name: Get tag name
         id: get_tag
         shell: bash
         run: |
           tag_name="$(echo $GITHUB_REF | cut -d / -f 3)"
           echo ::set-output name=tag::$tag_name
+
       - name: Create GitHub Release
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/buildSrc/src/main/kotlin/b2sdk.gradle.kts b/buildSrc/src/main/kotlin/b2sdk.gradle.kts
@@ -90,10 +90,10 @@ publishing {
             groupId = project.group.toString()
             artifactId = project.name
 
-            if (System.getenv("RELEASE_BUILD") != null) {
-                version = project.version.toString()
+            version = if (System.getenv("RELEASE_BUILD") != null) {
+                project.version.toString()
             } else {
-                version = when (val buildNum = System.getenv("BUILD_NUMBER")) {
+                when (val buildNum = System.getenv("BUILD_NUMBER")) {
                     null -> project.version.toString()
                     else -> "${project.version}+$buildNum"
                 }
@@ -134,6 +134,10 @@ publishing {
     }
 
     repositories {
+        maven("https://artifactory.backblaze.com/artifactory/maven-private/") {
+            name = "bzArtifactory"
+            credentials(PasswordCredentials::class)
+        }
         maven("https://maven.pkg.github.com/Backblaze/repo") {
             name = "bzGithubPackages"
             credentials(PasswordCredentials::class)
@@ -144,8 +148,8 @@ publishing {
 val sonatypeUsername = findProperty("sonatypeUsername")
 val sonatypePassword = findProperty("sonatypePassword")
 
-val gpgSigningKey = System.getenv("GPG_SIGNING_KEY")
-val gpgPassphrase = System.getenv("GPG_PASSPHRASE")
+val gpgSigningKey: String? = System.getenv("GPG_SIGNING_KEY")
+val gpgPassphrase: String? = System.getenv("GPG_PASSPHRASE")
 
 if (sonatypeUsername != null && sonatypePassword != null) {
     signing {
