diff --git a/apps/cli/executables/go/mod_analyst/main.go b/apps/cli/executables/go/mod_analyst/main.go index c5dabc7a0c48a68f2b9da1ee5be4e28c0708c800..026500d4707709d3e940610cdef5ae84654d11a1 100644 --- a/apps/cli/executables/go/mod_analyst/main.go +++ b/apps/cli/executables/go/mod_analyst/main.go @@ -16,7 +16,7 @@ * You should have received a copy of the GNU General Public License * along with Workspaces. If not, see <https://www.gnu.org/licenses/>. */ - +/* TEST */ package main import ( diff --git a/ci/bin/build-go.sh b/ci/bin/build-go.sh index cc4762470561111aae24096428f09c40452bc1de..58991ab7e46469a4a9f214c69372dd52f360f2a2 100755 --- a/ci/bin/build-go.sh +++ b/ci/bin/build-go.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Copyright (C) 2022 Associated Universities, Inc. Washington DC, USA. # # This file is part of NRAO Workspaces. @@ -47,5 +47,5 @@ do # echo "PEX build impossible in $PWD because there is no setup.py file" # fi # cd .. - go build + go build -o $module done diff --git a/ci/bin/generate-go-yaml.py b/ci/bin/generate-go-yaml.py index 141bed0787df66c0cf2a9e634dcae767a7072f5e..906658923ecb745892edd9a6639636557a15fecf 100755 --- a/ci/bin/generate-go-yaml.py +++ b/ci/bin/generate-go-yaml.py @@ -44,9 +44,14 @@ go-{go_name}-build: image: golang:1.18.0-alpine3.15 variables: GIT_SUBMODULE_STRATEGY: recursive + before_script: + - apk add git curl script: - echo "Building module - {go_name}" - - ./ci/bin/build-go.sh {go_name} + - /builds/ssa/workspaces/ci/bin/build-go.sh {go_name} + - pwd + - ls go/ + - ls - | curl --header "JOB-TOKEN: $CI_JOB_TOKEN" --upload-file go/{go_name} "$CI_API_V4_URL/projects/$CI_PROJECT_ID/packages/generic/{go_name}/0.0.1/{go_name}" rules: @@ -98,7 +103,7 @@ def main(argv): deploy_env = os.environ["DEPLOY_ENV"] go_changes = [] - rule = "$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH" + rule = "$CI_MERGE_REQUEST_ID" changes_rule = "" if deploy_env == "dev":