librewolf
/
bunkerized-nginx
mirror of https://github.com/bunkerity/bunkerized-nginx
4
0
Fork 1
Code Issues Projects Releases Wiki Activity

ci/cd - fix variable share for ARM

This commit is contained in:
florian 2023-04-30 10:56:46 +02:00
parent 6cecc70c32
commit 406c686e4f
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/beta.yml vendored
View File

@ -144,7 +144,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
ARM_SSH_IP: ${{ fromJSON(needs.create-arm.outputs.json).public_ip.address }}
ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }}
ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
build-sc-arm:
needs: [create-arm, build-bw-arm]
@ -160,7 +160,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
ARM_SSH_IP: ${{ fromJSON(needs.create-arm.outputs.json).public_ip.address }}
ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }}
ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
build-au-arm:
needs: [create-arm, build-sc-arm]
@ -176,7 +176,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
ARM_SSH_IP: ${{ fromJSON(needs.create-arm.outputs.json).public_ip.address }}
ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }}
ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
build-ui-arm:
needs: [create-arm, build-au-arm]
@ -192,7 +192,7 @@ jobs:
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
ARM_SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
ARM_SSH_IP: ${{ fromJSON(needs.create-arm.outputs.json).public_ip.address }}
ARM_SSH_IP: ${{ needs.create-arm.outputs.ip }}
ARM_SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
# Linux packages
@ -422,7 +422,7 @@ jobs:
needs: [create-arm, push-bunkerweb, push-scheduler, push-autoconf, push-ui]
uses: ./.github/workflows/rm-arm.yml
secrets:
ARM_ID: ${{ fromJSON(needs.create-arm.outputs.json).id }}
ARM_ID: ${{ needs.create-arm.outputs.id }}
SCW_ACCESS_KEY: ${{ secrets.SCW_ACCESS_KEY }}
SCW_SECRET_KEY: ${{ secrets.SCW_SECRET_KEY }}
SCW_DEFAULT_PROJECT_ID: ${{ secrets.SCW_DEFAULT_PROJECT_ID }}

12
.github/workflows/create-arm.yml vendored
View File

@ -3,12 +3,12 @@ name: Create ARM node (REUSABLE)
on:
workflow_call:
outputs:
arm_id:
id:
description: "ARM ID"
value: ${{ fromJson(jobs.build.outputs.json).id }}
arm_ip:
value: ${{ jobs.build.outputs.id }}
ip:
description: "ARM IP"
value: ${{ fromJson(jobs.build.outputs.json).public_ip.address }}
value: ${{ jobs.build.outputs.ip }}
secrets:
SCW_ACCESS_KEY:
@ -28,7 +28,9 @@ jobs:
build:
runs-on: ubuntu-latest
outputs:
json: steps.scw.outputs.json
json: ${{ fromJson(steps.scw.outputs.json) }}
id: ${{ fromJson(steps.scw.outputs.json).id }}
ip: ${{ fromJson(steps.scw.outputs.json).public_ip.address }}
steps:
# Prepare
- name: Checkout source code