From 8041bc322c9836d24036188e179accaf86be7c2b Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Wed, 6 Dec 2023 16:44:29 -0600 Subject: [PATCH 1/4] Fix next_ver. --- scripts/publish-app-record.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/publish-app-record.sh b/scripts/publish-app-record.sh index 81f1a93..ee6ace6 100755 --- a/scripts/publish-app-record.sh +++ b/scripts/publish-app-record.sh @@ -28,10 +28,14 @@ EOF next_ver=$(laconic -c $CONFIG_FILE cns record list --type ApplicationRecord --all --name "$rcd_name" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$CERC_LACONIC_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}') +if [ -z "$next_ver" ] || [ "1" == "$next_ver" ]; then + next_ver=0.0.1 +fi + cat < "$RECORD_FILE" record: type: ApplicationRecord - version: ${next_ver:-0.0.1} + version: ${next_ver} name: "$rcd_name" description: "$rcd_desc" homepage: "$rcd_homepage" -- 2.45.2 From 944bd4024d45e3f04a263f45e32aaf15014759ad Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Thu, 7 Dec 2023 23:01:30 +0000 Subject: [PATCH 2/4] Register CRN on release (#6) Add a CRN for the application on release as well as a record. Reviewed-on: https://git.vdb.to/cerc-io/test-progressive-web-app/pulls/6 Co-authored-by: Thomas E Lackey Co-committed-by: Thomas E Lackey --- .gitea/workflows/publish.yaml | 5 +++-- scripts/publish-app-record.sh | 27 +++++++++++++++++++-------- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 75a01ea..39db3bb 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -22,6 +22,7 @@ jobs: run: apt -y update && apt -y install jq - name: "Publish Record" env: - CERC_LACONIC_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }} - CERC_LACONIC_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }} + CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }} + CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }} + CERC_REGISTRY_APP_CRN: "crn://cerc-io/applications/test-progressive-web-app" run: scripts/publish-app-record.sh diff --git a/scripts/publish-app-record.sh b/scripts/publish-app-record.sh index ee6ace6..042ad9c 100755 --- a/scripts/publish-app-record.sh +++ b/scripts/publish-app-record.sh @@ -6,7 +6,8 @@ RECORD_FILE=tmp.rf.$$ CONFIG_FILE=`mktemp` CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp"} -CERC_REPO_TAG=${CERC_REPO_TAG:-${GITHUB_SHA:-main}} +CERC_REPO_REF=${CERC_REPO_REF:-${GITHUB_SHA:-`git log -1 --format="%H"`}} +CERC_IS_LATEST_RELEASE=${CERC_IS_LATEST_RELEASE:-"true"} rcd_name=$(jq -r '.name' package.json | sed 's/null//') rcd_desc=$(jq -r '.description' package.json | sed 's/null//') @@ -19,14 +20,14 @@ rcd_app_version=$(jq -r '.version' package.json | sed 's/null//') cat < "$CONFIG_FILE" services: cns: - restEndpoint: '${CERC_LACONIC_REST_ENDPOINT:-http://console.laconic.com:1317}' - gqlEndpoint: '${CERC_LACONIC_GQL_ENDPOINT:-http://console.laconic.com:9473/api}' - chainId: ${CERC_LACONIC_CHAIN_ID:-laconic_9000-1} - gas: 350000 + restEndpoint: '${CERC_REGISTRY_REST_ENDPOINT:-http://console.laconic.com:1317}' + gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://console.laconic.com:9473/api}' + chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic_9000-1} + gas: 550000 fees: 200000aphoton EOF -next_ver=$(laconic -c $CONFIG_FILE cns record list --type ApplicationRecord --all --name "$rcd_name" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$CERC_LACONIC_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}') +next_ver=$(laconic -c $CONFIG_FILE cns record list --type ApplicationRecord --all --name "$rcd_name" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$CERC_REGISTRY_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}') if [ -z "$next_ver" ] || [ "1" == "$next_ver" ]; then next_ver=0.0.1 @@ -42,13 +43,23 @@ record: license: "$rcd_license" author: "$rcd_author" repository: "$rcd_repository" - repository_tag: "$CERC_REPO_TAG" + repository_ref: "$CERC_REPO_REF" app_version: "$rcd_app_version" app_type: "$CERC_APP_TYPE" EOF cat $RECORD_FILE -laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_LACONIC_USER_KEY}" --bond-id ${CERC_LACONIC_BOND_ID} +RECORD_ID=$(laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} | jq -r '.id') +echo $RECORD_ID + +if [ -n "$CERC_REGISTRY_APP_CRN" ]; then + laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${rcd_app_version}" "$RECORD_ID" + laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@${CERC_REPO_REF}" "$RECORD_ID" + if [ "true" == "$CERC_IS_LATEST_RELEASE" ]; then + laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN" "$RECORD_ID" + laconic -c $CONFIG_FILE cns name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_CRN@latest" "$RECORD_ID" + fi +fi rm -f $RECORD_FILE $CONFIG_FILE -- 2.45.2 From eb405231d97a8be010a75a66f6bb9be50498c129 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Thu, 7 Dec 2023 23:03:32 +0000 Subject: [PATCH 3/4] v0.1.1 (#7) Reviewed-on: https://git.vdb.to/cerc-io/test-progressive-web-app/pulls/7 Co-authored-by: Thomas E Lackey Co-committed-by: Thomas E Lackey --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index f99862c..fae2c94 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "@cerc-io/test-progressive-web-app", - "version": "0.1.0", + "version": "0.1.1", "repository": "https://git.vdb.to/cerc-io/test-progressive-web-app", "scripts": { "dev": "next dev", -- 2.45.2 From b9658f79c79727e07d481163e53a265b164447d8 Mon Sep 17 00:00:00 2001 From: zramsay Date: Tue, 12 Dec 2023 14:54:19 +0000 Subject: [PATCH 4/4] fix (#9) Co-authored-by: zramsay Reviewed-on: https://git.vdb.to/cerc-io/test-progressive-web-app/pulls/9 Reviewed-by: David Boreham --- scripts/publish-app-record.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/publish-app-record.sh b/scripts/publish-app-record.sh index 042ad9c..87a8cc7 100755 --- a/scripts/publish-app-record.sh +++ b/scripts/publish-app-record.sh @@ -14,7 +14,7 @@ rcd_desc=$(jq -r '.description' package.json | sed 's/null//') rcd_repository=$(jq -r '.repository' package.json | sed 's/null//') rcd_homepage=$(jq -r '.homepage' package.json | sed 's/null//') rcd_license=$(jq -r '.license' package.json | sed 's/null//') -rcd_author=$(jq -r '.license' package.json | sed 's/null//') +rcd_author=$(jq -r '.author' package.json | sed 's/null//') rcd_app_version=$(jq -r '.version' package.json | sed 's/null//') cat < "$CONFIG_FILE" -- 2.45.2