From 0ba6941cd201ce617d63d1cee194d4c4105c5f18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Mon, 13 Apr 2020 15:44:33 +0200 Subject: [PATCH] Fixing ref slug --- .github/workflows/build-and-deploy.yml | 5 ++++- deeployer.libsonnet | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 1dd48da8..7c5ca664 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -59,9 +59,12 @@ jobs: - name: Checkout uses: actions/checkout@v2 + # Create a slugified value of the branch + - uses: rlespinasse/github-slug-action@master + - name: Deploy uses: thecodingmachine/deeployer@master env: KUBE_CONFIG_FILE: ${{ secrets.KUBE_CONFIG_FILE }} with: - namespace: workadventure-${GITHUB_REF##*/} + namespace: workadventure-${{GITHUB_REF_SLUG}} diff --git a/deeployer.libsonnet b/deeployer.libsonnet index 51c55580..599012c4 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -1,11 +1,12 @@ { local env = std.extVar("env"), # FIXME: namespace does not work if the branch contains a "/" - local namespace = std.split(env.GITHUB_REF, "/")[2], + local namespace = env.GITHUB_REF_SLUG, + local tag = if namespace == "master" then "latest" else namespace, "$schema": "https://raw.githubusercontent.com/thecodingmachine/deeployer/master/deeployer.schema.json", "containers": { "back": { - "image": "thecodingmachine/workadventure-back:"+(if namespace == "master" then "latest" else namespace), + "image": "thecodingmachine/workadventure-back:"+tag, "host": "api."+namespace+".workadventure.test.thecodingmachine.com", "ports": [8080], "env": { @@ -13,7 +14,7 @@ } }, "front": { - "image": "thecodingmachine/workadventure-front:"+(if namespace == "master" then "latest" else namespace), + "image": "thecodingmachine/workadventure-front:"+tag, "host": namespace+".workadventure.test.thecodingmachine.com", "ports": [80], "env": {