From 067c61832197bcc0681c770caf88b515baa949c6 Mon Sep 17 00:00:00 2001 From: zramsay Date: Wed, 27 Sep 2023 17:35:27 -0400 Subject: [PATCH] squash me debug --- .gitea/workflows/gitea.yml | 4 +- README.md | 2 - .../cerc-builder-js/build-npm-package.sh | 39 ++++++++++++++----- tests/gitea/test.sh | 9 ++++- 4 files changed, 40 insertions(+), 14 deletions(-) diff --git a/.gitea/workflows/gitea.yml b/.gitea/workflows/gitea.yml index 93d2ff74..5515812b 100644 --- a/.gitea/workflows/gitea.yml +++ b/.gitea/workflows/gitea.yml @@ -45,5 +45,7 @@ jobs: dockerd -H $DOCKER_HOST --userland-proxy=false & sleep 5 - name: "Run gitea tests" - run: ./tests/gitea/test.sh + run: | + export CERC_SCRIPT_DEBUG=true & + ./tests/gitea/test.sh diff --git a/README.md b/README.md index b7e75aaf..a888895e 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,5 @@ # Stack Orchestrator -test - Stack Orchestrator allows building and deployment of a Laconic Stack on a single machine with minimial prerequisites. It is a Python3 CLI tool that runs on any OS with Python3 and Docker. The following diagram summarizes the relevant repositories in the Laconic Stack - and the relationship to Stack Orchestrator. ![The Stack](/docs/images/laconic-stack.png) diff --git a/app/data/container-build/cerc-builder-js/build-npm-package.sh b/app/data/container-build/cerc-builder-js/build-npm-package.sh index 375712e5..499781bb 100755 --- a/app/data/container-build/cerc-builder-js/build-npm-package.sh +++ b/app/data/container-build/cerc-builder-js/build-npm-package.sh @@ -1,9 +1,25 @@ #!/bin/bash # Usage: build-npm-package.sh # Note: supply the registry auth token in CERC_NPM_AUTH_TOKEN +# + + if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then set -x fi + +echo "GITEA ACTIONS 1 is: $GITEA_ACTIONS" +echo "GITEA ACTIONS 2 is: ${GITEA_ACTIONS}" + +echo "token 1 is: $CERC_NPM_AUTH_TOKEN" +echo "token 2 is: ${CERC_NPM_AUTH_TOKEN}" + +if [[ "$GITEA_ACTIONS" = "true" ]]; then + echo "WORKS" +else + echo "WTF" +fi + if ! [[ $# -eq 1 || $# -eq 2 ]]; then echo "Illegal number of parameters" >&2 exit 1 @@ -28,17 +44,20 @@ npm config set @lirewine:registry ${local_npm_registry_url} local_npm_registry_url_fixed=$( echo ${local_npm_registry_url} | sed -e 's/^http[s]\{0,1\}://') npm config set -- ${local_npm_registry_url_fixed}:_authToken ${CERC_NPM_AUTH_TOKEN} # First check if the version of this package we're trying to build already exists in the registry +# but this line: "jq -r .data.dist.tarball" fails only in gitea, so skip this block +if [[ "${GITEA_ACTIONS}" != "true" ]]; then package_exists=$( yarn info --json ${package_name}@${package_publish_version} 2>/dev/null | jq -r .data.dist.tarball ) -if [[ ! -z "$package_exists" && "$package_exists" != "null" ]]; then - echo "${package_publish_version} of ${package_name} already exists in the registry" - if [[ ${CERC_FORCE_REBUILD} == "true" ]]; then - # Attempt to unpublish the existing package - echo "NOTE: unpublishing existing package version since force rebuild is enabled" - npm unpublish --force ${package_name}@${package_publish_version} - else - echo "skipping build since target version already exists" - exit 0 - fi + if [[ ! -z "$package_exists" && "$package_exists" != "null" ]]; then + echo "${package_publish_version} of ${package_name} already exists in the registry" + if [[ ${CERC_FORCE_REBUILD} == "true" ]]; then + # Attempt to unpublish the existing package + echo "NOTE: unpublishing existing package version since force rebuild is enabled" + npm unpublish --force ${package_name}@${package_publish_version} + else + echo "skipping build since target version already exists" + exit 0 + fi + fi fi echo "Build and publish ${package_name} version ${package_publish_version}" yarn install diff --git a/tests/gitea/test.sh b/tests/gitea/test.sh index c9c1a681..747986e9 100755 --- a/tests/gitea/test.sh +++ b/tests/gitea/test.sh @@ -1,12 +1,17 @@ #!/usr/bin/env bash set -e + +export CERC_SCRIPT_DEBUG=true if [ -n "$CERC_SCRIPT_DEBUG" ]; then set -x fi # Dump environment variables for debugging echo "Environment variables:" env + +echo "holla 1 $GITEA_ACTIONS" echo "Running gitea test" + # Bit of a hack, test the most recent package TEST_TARGET_SO=$( ls -t1 ./package/laconic-so* | head -1 ) # Set a non-default repo dir @@ -25,8 +30,10 @@ $TEST_TARGET_SO --stack package-registry build-containers output=$($TEST_TARGET_SO --stack package-registry deploy-system up) token=$(echo $output | grep -o 'export CERC_NPM_AUTH_TOKEN=[^ ]*' | cut -d '=' -f 2) export CERC_NPM_AUTH_TOKEN=$token +export GITEA_ACTIONS=true +echo "holla 2 $GITEA_ACTIONS" $TEST_TARGET_SO --stack fixturenet-laconicd setup-repositories -$TEST_TARGET_SO --stack fixturenet-laconicd build-npms +$TEST_TARGET_SO --stack fixturenet-laconicd --verbose --debug build-npms --include laconic-sdk # Clean up $TEST_TARGET_SO --stack package-registry deploy-system down