From 37d1a4141556987504698d4137dbc8b0544dfd68 Mon Sep 17 00:00:00 2001 From: Thomas E Lackey Date: Thu, 14 Dec 2023 12:07:00 -0600 Subject: [PATCH] dos2unix --- .gitea/workflows/publish.yaml | 62 +++++++-------- package.json | 44 +++++------ scripts/publish-app-record.sh | 138 +++++++++++++++++----------------- 3 files changed, 122 insertions(+), 122 deletions(-) diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml index 1ad39a8..acce2e7 100644 --- a/.gitea/workflows/publish.yaml +++ b/.gitea/workflows/publish.yaml @@ -1,31 +1,31 @@ -name: Publish ApplicationRecord to Registry -on: - release: - types: [published] - -env: - CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }} - CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }} - -jobs: - cns_publish: - runs-on: ubuntu-latest - steps: - - name: "Clone project repository" - uses: actions/checkout@v3 - - name: Use Node.js - uses: actions/setup-node@v3 - with: - node-version: 18 - - name: "Install Yarn" - run: npm install -g yarn - - name: "Install registry CLI" - run: | - npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/ - yarn global add @cerc-io/laconic-registry-cli - - name: "Install jq" - run: apt -y update && apt -y install jq - - name: "Publish Application Record" - run: scripts/publish-app-record.sh - - name: "Request Deployment" - run: scripts/request-app-deployment.sh +name: Publish ApplicationRecord to Registry +on: + release: + types: [published] + +env: + CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }} + CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }} + +jobs: + cns_publish: + runs-on: ubuntu-latest + steps: + - name: "Clone project repository" + uses: actions/checkout@v3 + - name: Use Node.js + uses: actions/setup-node@v3 + with: + node-version: 18 + - name: "Install Yarn" + run: npm install -g yarn + - name: "Install registry CLI" + run: | + npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/ + yarn global add @cerc-io/laconic-registry-cli + - name: "Install jq" + run: apt -y update && apt -y install jq + - name: "Publish Application Record" + run: scripts/publish-app-record.sh + - name: "Request Deployment" + run: scripts/request-app-deployment.sh diff --git a/package.json b/package.json index 086a1a0..c078803 100644 --- a/package.json +++ b/package.json @@ -1,22 +1,22 @@ -{ - "private": true, - "name": "@cerc-io/test-progressive-web-app", - "version": "0.1.4", - "repository": "https://git.vdb.to/cerc-io/test-progressive-web-app", - "scripts": { - "dev": "next dev", - "build": "next build", - "start": "next start" - }, - "dependencies": { - "next": "latest", - "next-pwa": "^5.6.0", - "react": "^18.2.0", - "react-dom": "^18.2.0" - }, - "devDependencies": { - "@types/node": "17.0.4", - "@types/react": "17.0.38", - "typescript": "4.5.4" - } -} +{ + "private": true, + "name": "@cerc-io/test-progressive-web-app", + "version": "0.1.4", + "repository": "https://git.vdb.to/cerc-io/test-progressive-web-app", + "scripts": { + "dev": "next dev", + "build": "next build", + "start": "next start" + }, + "dependencies": { + "next": "latest", + "next-pwa": "^5.6.0", + "react": "^18.2.0", + "react-dom": "^18.2.0" + }, + "devDependencies": { + "@types/node": "17.0.4", + "@types/react": "17.0.38", + "typescript": "4.5.4" + } +} diff --git a/scripts/publish-app-record.sh b/scripts/publish-app-record.sh index 942967a..cb406d7 100755 --- a/scripts/publish-app-record.sh +++ b/scripts/publish-app-record.sh @@ -1,69 +1,69 @@ -#!/bin/bash - -set -e - -RECORD_FILE=tmp.rf.$$ -CONFIG_FILE=`mktemp` - -CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp"} -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//') -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 '.author' package.json | sed 's/null//') -rcd_app_version=$(jq -r '.version' package.json | sed 's/null//') - -cat < "$CONFIG_FILE" -services: - cns: - 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_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 -fi - -cat < "$RECORD_FILE" -record: - type: ApplicationRecord - version: ${next_ver} - name: "$rcd_name" - description: "$rcd_desc" - homepage: "$rcd_homepage" - license: "$rcd_license" - author: "$rcd_author" - repository: - - "$rcd_repository" - repository_ref: "$CERC_REPO_REF" - app_version: "$rcd_app_version" - app_type: "$CERC_APP_TYPE" -EOF - - -cat $RECORD_FILE -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 [ -z "$CERC_REGISTRY_APP_CRN" ]; then - authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//') - app=$(echo "$rcd_name" | cut -d'/' -f2-) - CERC_REGISTRY_APP_CRN="crn://$authority/applications/$app" -fi - -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" -fi - -rm -f $RECORD_FILE $CONFIG_FILE +#!/bin/bash + +set -e + +RECORD_FILE=tmp.rf.$$ +CONFIG_FILE=`mktemp` + +CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp"} +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//') +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 '.author' package.json | sed 's/null//') +rcd_app_version=$(jq -r '.version' package.json | sed 's/null//') + +cat < "$CONFIG_FILE" +services: + cns: + 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_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 +fi + +cat < "$RECORD_FILE" +record: + type: ApplicationRecord + version: ${next_ver} + name: "$rcd_name" + description: "$rcd_desc" + homepage: "$rcd_homepage" + license: "$rcd_license" + author: "$rcd_author" + repository: + - "$rcd_repository" + repository_ref: "$CERC_REPO_REF" + app_version: "$rcd_app_version" + app_type: "$CERC_APP_TYPE" +EOF + + +cat $RECORD_FILE +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 [ -z "$CERC_REGISTRY_APP_CRN" ]; then + authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//') + app=$(echo "$rcd_name" | cut -d'/' -f2-) + CERC_REGISTRY_APP_CRN="crn://$authority/applications/$app" +fi + +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" +fi + +rm -f $RECORD_FILE $CONFIG_FILE