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

ci/cd - fix wrong json keys from scw api

This commit is contained in:
florian 2023-04-30 04:05:17 +02:00
parent 1b79e291eb
commit 8867eb23be
No known key found for this signature in database
GPG Key ID: 3D80806F12602A7C
2 changed files with 11 additions and 11 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).PublicIP.Address }}
ARM_SSH_IP: ${{ fromJSON(needs.create-arm.outputs.json).public_ip.address }}
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).PublicIP.Address }}
ARM_SSH_IP: ${{ fromJSON(needs.create-arm.outputs.json).public_ip.address }}
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).PublicIP.Address }}
ARM_SSH_IP: ${{ fromJSON(needs.create-arm.outputs.json).public_ip.address }}
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).PublicIP.Address }}
ARM_SSH_IP: ${{ fromJSON(needs.create-arm.outputs.json).public_ip.address }}
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: ${{ fromJSON(needs.create-arm.outputs.json).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

@ -5,10 +5,10 @@ on:
outputs:
arm_id:
description: "ARM ID"
value: ${{ fromJson(jobs.build.outputs.json).ID }}
value: ${{ fromJson(jobs.build.outputs.json).id }}
arm_ip:
description: "ARM IP"
value: ${{ fromJson(jobs.build.outputs.json).PublicIP.Address }}
value: ${{ fromJson(jobs.build.outputs.json).public_ip.address }}
secrets:
SCW_ACCESS_KEY:
@ -49,8 +49,8 @@ jobs:
- name: Wait for SSH
uses: iFaxity/wait-on-action@628831cec646e6dacca502f34a6c6b46e131e51d
with:
resource: tcp://${{ fromJson(steps.scw.outputs.json).PublicIP.Address }}:22
timeout: 30000
resource: tcp://${{ fromJson(steps.scw.outputs.json).public_ip.address }}:22
timeout: 600000
- name: Setup SSH for ARM node
if: inputs.CACHE_SUFFIX == 'arm'
run: |
@ -60,8 +60,8 @@ jobs:
echo "$SSH_CONFIG" | sed "s/SSH_IP/$SSH_IP/g" > ~/.ssh/config
env:
SSH_KEY: ${{ secrets.ARM_SSH_KEY }}
SSH_IP: ${{ fromJson(steps.scw.outputs.json).PublicIP.Address }}
SSH_IP: ${{ fromJson(steps.scw.outputs.json).public_ip.address }}
SSH_CONFIG: ${{ secrets.ARM_SSH_CONFIG }}
- name: Install Docker
run: scw instance server ssh ${{ fromJson(steps.scw.outputs.json).ID }} zone=fr-par-2 "command=curl -fsSL https://test.docker.com -o test-docker.sh ; sh test-docker.sh"
run: scw instance server ssh ${{ fromJson(steps.scw.outputs.json).id }} zone=fr-par-2 "command=curl -fsSL https://test.docker.com -o test-docker.sh ; sh test-docker.sh"