From 3149642d7d94eaa5717446aee14f735d86a36805 Mon Sep 17 00:00:00 2001 From: Piotr Mankowski Date: Wed, 16 Oct 2024 13:55:59 -0700 Subject: [PATCH] Fix for CI (#84) * Fix for CI --- .github/workflows/main.yml | 6 +++--- get-cli.sh | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4bcbff3..f463004 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,10 +2,10 @@ name: CI on: push: branches: - - master + - main pull_request: branches: - - master + - main workflow_dispatch: jobs: @@ -26,7 +26,7 @@ jobs: run: docker swarm init - name: Build local docker image of HIE - run: ./build-image.sh + run: ./build-custom-images.sh - name: Download instant CLI run: ./get-cli.sh linux latest diff --git a/get-cli.sh b/get-cli.sh index d153b74..126c0cd 100755 --- a/get-cli.sh +++ b/get-cli.sh @@ -6,8 +6,8 @@ cli_version=${2:-latest} case ${option} in linux) echo "Downloading linux binary version: ${cli_version}" - curl -L https://github.com/openhie/instant-v2/releases/download/"$cli_version"/instant-linux -o instant-linux - chmod +x ./instant-linux + curl -L https://github.com/openhie/instant-v2/releases/download/"$cli_version"/instant-linux -o instant + chmod +x ./instant exit 0 ;; macos) @@ -24,10 +24,10 @@ windows) ;; all) echo "Downloading all binaries, version: ${cli_version}" - curl -L https://github.com/openhie/instant-v2/releases/download/"$cli_version"/instant-linux -o instant-linux + curl -L https://github.com/openhie/instant-v2/releases/download/"$cli_version"/instant-linux -o instant curl -L https://github.com/openhie/instant-v2/releases/download/"$cli_version"/instant-macos -o instant-macos curl -L https://github.com/openhie/instant-v2/releases/download/"$cli_version"/instant-win.exe -o instant.exe - chmod +x ./instant-linux + chmod +x ./instant chmod +x ./instant-macos chmod +x ./instant.exe exit 0