From 404d01c6490016f0e6b6a79800024084fd76ef44 Mon Sep 17 00:00:00 2001 From: Alex Zenla Date: Sat, 28 Jan 2023 21:09:40 -0800 Subject: [PATCH] Repair GitHub Release Workflow --- .github/workflows/release.yml | 36 ++++++++++++++--------------- foundation-bifrost/build.gradle.kts | 4 ++-- foundation-chaos/build.gradle.kts | 2 +- tools/gh-upload-backblaze.sh | 9 ++++++++ 4 files changed, 29 insertions(+), 22 deletions(-) create mode 100755 tools/gh-upload-backblaze.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 593ea73..16076a3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,30 +1,28 @@ -name: Upload to S3 - +name: Release on: push: branches: - - 'main' - + - main jobs: upload: runs-on: ubuntu-latest steps: - - uses: actions/checkout@master - - name: Install JDK - uses: actions/setup-java@v2 + - name: Checkout Repository + uses: actions/checkout@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v3 with: java-version: '17' distribution: 'temurin' - - name: Build - run: ./gradlew --no-daemon build - - name: Organize artifacts - run: ./tools/organize-artifacts.sh - - uses: GayPizzaSpecifications/upload-s3-action@b2_support + - name: Build with Gradle + uses: gradle/gradle-build-action@v2 with: - aws_key_id: ${{ secrets.ARTIFACTS_KEY_ID }} - aws_secret_access_key: ${{ secrets.ARTIFACTS_APP_KEY }} - aws_bucket: ${{ secrets.ARTIFACTS_BUCKET }} - aws_endpoint: ${{ secrets.ARTIFACTS_ENDPOINT }} - aws_region: ${{ secrets.ARTIFACTS_REGION }} - source_dir: 'artifacts/' - destination_dir: 'foundation/' + arguments: build + - name: Organize Artifacts + run: ./tools/organize-artifacts.sh + - name: Upload to Backblaze + run: ./tools/gh-upload-backblaze.sh + env: + ARTIFACTS_KEY_ID: "${{ secrets.ARTIFACTS_KEY_ID }}" + ARTIFACTS_APP_KEY: "${{ secrets.ARTIFACTS_APP_KEY }}" + ARTIFACTS_BUCKET: "${{ secrets.ARTIFACTS_BUCKET }}" diff --git a/foundation-bifrost/build.gradle.kts b/foundation-bifrost/build.gradle.kts index 5265477..a9d360f 100644 --- a/foundation-bifrost/build.gradle.kts +++ b/foundation-bifrost/build.gradle.kts @@ -1,9 +1,9 @@ plugins { - id("gay.pizza.foundation.concrete-plugin") version "0.7.0" + id("gay.pizza.foundation.concrete-plugin") } dependencies { - implementation("net.dv8tion:JDA:5.0.0-alpha.2") { + implementation("net.dv8tion:JDA:5.0.0-beta.3") { exclude(module = "opus-java") } diff --git a/foundation-chaos/build.gradle.kts b/foundation-chaos/build.gradle.kts index 525b320..1872b5a 100644 --- a/foundation-chaos/build.gradle.kts +++ b/foundation-chaos/build.gradle.kts @@ -1,5 +1,5 @@ plugins { - id("gay.pizza.foundation.concrete-plugin") version "0.7.0" + id("gay.pizza.foundation.concrete-plugin") } dependencies { diff --git a/tools/gh-upload-backblaze.sh b/tools/gh-upload-backblaze.sh new file mode 100755 index 0000000..f7955bc --- /dev/null +++ b/tools/gh-upload-backblaze.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +set -e + +BACKBLAZE_B2_VERSION="3.6.0" + +curl -sL -o b2 "https://github.com/Backblaze/B2_Command_Line_Tool/releases/download/v${BACKBLAZE_B2_VERSION}/b2-linux" +chmod +x b2 +./b2 authorize-account "${ARTIFACTS_KEY_ID}" "${ARTIFACTS_APP_KEY}" +./b2 sync --delete --replaceNewer artifacts/ "b2:///${ARTIFACTS_BUCKET}/foundation/"