From c2b37a8243a6a52e8e0bffeb114198160bd205da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobi=20Sch=C3=A4fer?= Date: Fri, 3 Jan 2025 13:35:33 +0100 Subject: [PATCH] Update workflows for Forgejo runner --- .github/workflows/deploy.yml | 9 +-------- .github/workflows/release.yml | 17 +++++------------ .github/workflows/stage.yml | 20 ++------------------ 3 files changed, 8 insertions(+), 38 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index c01702e5..cdad2c55 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -4,19 +4,12 @@ on: workflow_dispatch jobs: deploy: - runs-on: ubuntu-latest + runs-on: antville environment: name: weblogs.at url: https://weblogs.at steps: - - name: Set up SSH agent - uses: antville/helma/.github/actions/ssh@helma-🐜 - with: - config: ${{ vars.SSH_CONFIG }} - key: ${{ secrets.SSH_PRIVATE_KEY }} - known-hosts: ${{ vars.SSH_KNOWN_HOSTS }} - - name: Copy files to production server run: ssh staging-server deploy-helma diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 59d8f365..b189f260 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ permissions: jobs: build: - runs-on: ubuntu-latest + runs-on: antville env: GH_TOKEN: ${{ github.token }} @@ -19,27 +19,20 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Set up Java - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 21 - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@v4 - - name: Build with Gradle run: ./gradlew assembleDist - name: Create release + # FIXME: Currently only outputs gh command; adapt for Forgejo run: | - gh release create "$GITHUB_REF_NAME" \ + echo gh release create "$GITHUB_REF_NAME" \ --repo "$GITHUB_REPOSITORY" \ --title "$(date +'%d %b %Y')" \ --generate-notes - name: Upload assets + # FIXME: Currently only outputs gh command; adapt for Forgejo run: | - gh release upload "$GITHUB_REF_NAME" \ + echo gh release upload "$GITHUB_REF_NAME" \ build/distributions/helma-*.* \ --clobber diff --git a/.github/workflows/stage.yml b/.github/workflows/stage.yml index eac49cc3..17e693d4 100644 --- a/.github/workflows/stage.yml +++ b/.github/workflows/stage.yml @@ -4,31 +4,15 @@ on: workflow_dispatch jobs: stage: - runs-on: ubuntu-latest + runs-on: antville environment: name: stage - url: https://antville-test.online + url: ${{ vars.stage_url }} steps: - uses: actions/checkout@v4 - - name: Set up SSH agent - uses: ./.github/actions/ssh - with: - config: ${{ vars.SSH_CONFIG }} - key: ${{ secrets.SSH_PRIVATE_KEY }} - known-hosts: ${{ vars.SSH_KNOWN_HOSTS }} - - - name: Set up Java - uses: actions/setup-java@v4 - with: - distribution: temurin - java-version: 21 - - - name: Set up Gradle - uses: gradle/actions/setup-gradle@v4 - - name: Build with Gradle run: ./gradlew installDist