From 100cb7dfeeae846a2a5c25982e3a60b834e6b29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Fabianski?= Date: Wed, 23 Nov 2022 19:06:54 +0100 Subject: [PATCH 1/2] fix: fix battle test workflow --- .github/workflows/battle_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/battle_tests.yml b/.github/workflows/battle_tests.yml index 00028da49..a98ed57bb 100644 --- a/.github/workflows/battle_tests.yml +++ b/.github/workflows/battle_tests.yml @@ -76,7 +76,7 @@ jobs: uses: dsaltares/fetch-gh-release-asset@1.1.0 with: repo: "Bearer/curio" - version: ${{ input.curio_version }} + version: ${{ inputs.curio_version }} # version: "tags/v0.5.0" # file: "curio_0.5.0_linux_amd64.tar.gz" regex: true @@ -99,8 +99,8 @@ jobs: build-args: | CURIO_VERSION=${{ steps.latest_artifact.outputs.version }} BATTLE_TEST_SHA=${{ github.sha }} - ATTEMPT=${{ input.attempt }} - LANGUAGE=${{ input.language }} + ATTEMPT=${{ inputs.attempt }} + LANGUAGE=${{ inputs.language }} - name: Configure AWS credentials uses: aws-actions/configure-aws-credentials@v1 From b21b558de3b341649e0237575fc1e0e73d8f0c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Fabianski?= Date: Wed, 23 Nov 2022 19:23:42 +0100 Subject: [PATCH 2/2] fix: fix args passed to docker --- battle_tests/Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/battle_tests/Dockerfile b/battle_tests/Dockerfile index 1e449c806..a0b9afffc 100644 --- a/battle_tests/Dockerfile +++ b/battle_tests/Dockerfile @@ -3,6 +3,8 @@ FROM golang:latest AS builder ARG CURIO_VERSION ARG BATTLE_TEST_SHA +ARG ATTEMPT +ARG LANGUAGE RUN mkdir /app ADD . /app/ @@ -10,7 +12,7 @@ WORKDIR /app # RUN apk update && apk upgrade && apk add --no-cache build-base git -RUN go build -ldflags="-X 'github.com/bearer/curio/battle_tests/build.CurioVersion=${CURIO_VERSION}' -X 'github.com/bearer/curio/battle_tests/build.BattleTestSHA=${BATTLE_TEST_SHA}' -X 'github.com/bearer/curio/battle_tests/build.Attempt=${ATTEMPT}' -X 'github.com/bearer/curio/battle_tests/build.Language=${Language}'" \ +RUN go build -ldflags="-X 'github.com/bearer/curio/battle_tests/build.CurioVersion=${CURIO_VERSION}' -X 'github.com/bearer/curio/battle_tests/build.BattleTestSHA=${BATTLE_TEST_SHA}' -X 'github.com/bearer/curio/battle_tests/build.Attempt=${ATTEMPT}' -X 'github.com/bearer/curio/battle_tests/build.Language=${LANGUAGE}'" \ -a -o dist/battle_tests ./battle_tests/battle_tests.go # FROM alpine