Compare commits
64 Commits
Author | SHA1 | Date | |
---|---|---|---|
f06f0ce284 | |||
a412f3a194 | |||
80b21daa6b | |||
8bb3dcfcf2 | |||
673a2c356f | |||
944239523b | |||
f82059b995 | |||
3fec09627a | |||
6a22580f35 | |||
bc94d0c9aa | |||
e62a4a8e49 | |||
b773d39135 | |||
5d6045103b | |||
49ed5166a9 | |||
a4a139b420 | |||
116f0b30bf | |||
cdb4b8a475 | |||
05d0d29e61 | |||
caa2be6478 | |||
c31871213f | |||
190d2fa019 | |||
3ee5bc9556 | |||
f308b28eb4 | |||
f4e2492b01 | |||
3bb7ca4ae8 | |||
83a6347551 | |||
06b8756dfd | |||
c6673bde9d | |||
1375d0ad65 | |||
62ec540e18 | |||
bd2278384c | |||
8686fc0739 | |||
a04d5e2799 | |||
951b71c805 | |||
04188bf004 | |||
0581961948 | |||
d0f50ce666 | |||
35652a4abc | |||
2d700ba6fd | |||
cb9b2e37fd | |||
7df657bb01 | |||
a5c4fed775 | |||
bccab7fb4e | |||
4c682dc6ea | |||
c938d4ef9b | |||
23fb381dbf | |||
8e6405e42e | |||
4b87d958e5 | |||
b59fcd49c1 | |||
760b0efacb | |||
7436691349 | |||
6f079d2b58 | |||
2d15816d60 | |||
46b23b7e96 | |||
35b2bc10dd | |||
8d1002f167 | |||
37d1a41415 | |||
3d7d613c78 | |||
6663846f81 | |||
8a11fe74d7 | |||
57ec4250c7 | |||
3af6bd18f4 | |||
2d6b28f3e6 | |||
bee6fae753 |
@ -2,6 +2,11 @@ name: Publish ApplicationRecord to Registry
|
|||||||
on:
|
on:
|
||||||
release:
|
release:
|
||||||
types: [published]
|
types: [published]
|
||||||
|
|
||||||
|
env:
|
||||||
|
CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }}
|
||||||
|
CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }}
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
cns_publish:
|
cns_publish:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
@ -12,17 +17,15 @@ jobs:
|
|||||||
uses: actions/setup-node@v3
|
uses: actions/setup-node@v3
|
||||||
with:
|
with:
|
||||||
node-version: 18
|
node-version: 18
|
||||||
- name: "Install Yarn"
|
- name: "Enable Yarn"
|
||||||
run: npm install -g yarn
|
run: corepack enable
|
||||||
- name: "Install registry CLI"
|
- name: "Install registry CLI"
|
||||||
run: |
|
run: |
|
||||||
npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/
|
npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/
|
||||||
yarn global add @cerc-io/laconic-registry-cli
|
npm install -g @cerc-io/laconic-registry-cli@0.1.13
|
||||||
- name: "Install jq"
|
- name: "Install jq"
|
||||||
run: apt -y update && apt -y install jq
|
run: apt -y update && apt -y install jq
|
||||||
- name: "Publish Record"
|
- name: "Publish Application Record"
|
||||||
env:
|
|
||||||
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
|
run: scripts/publish-app-record.sh
|
||||||
|
- name: "Request Deployment"
|
||||||
|
run: scripts/request-app-deployment.sh
|
||||||
|
@ -1,12 +1,13 @@
|
|||||||
/** @type {import('next').NextConfig} */
|
import withPWA from 'next-pwa';
|
||||||
const withPWA = require('next-pwa')({
|
|
||||||
dest: 'public',
|
|
||||||
})
|
|
||||||
|
|
||||||
module.exports = withPWA({
|
const config = {
|
||||||
env: {
|
env: {
|
||||||
CERC_TEST_WEBAPP_CONFIG1: process.env.CERC_TEST_WEBAPP_CONFIG1,
|
CERC_TEST_WEBAPP_CONFIG1: process.env.CERC_TEST_WEBAPP_CONFIG1,
|
||||||
CERC_TEST_WEBAPP_CONFIG2: process.env.CERC_TEST_WEBAPP_CONFIG2,
|
CERC_TEST_WEBAPP_CONFIG2: process.env.CERC_TEST_WEBAPP_CONFIG2,
|
||||||
CERC_WEBAPP_DEBUG: process.env.CERC_WEBAPP_DEBUG,
|
CERC_WEBAPP_DEBUG: process.env.CERC_WEBAPP_DEBUG,
|
||||||
},
|
}
|
||||||
})
|
};
|
||||||
|
|
||||||
|
const nextConfig = withPWA({ dest: 'public' })(config);
|
||||||
|
|
||||||
|
export default nextConfig;
|
2832
package-lock.json
generated
2832
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,7 +1,6 @@
|
|||||||
{
|
{
|
||||||
"private": true,
|
|
||||||
"name": "@cerc-io/test-progressive-web-app",
|
"name": "@cerc-io/test-progressive-web-app",
|
||||||
"version": "0.1.1",
|
"version": "0.1.53",
|
||||||
"repository": "https://git.vdb.to/cerc-io/test-progressive-web-app",
|
"repository": "https://git.vdb.to/cerc-io/test-progressive-web-app",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "next dev",
|
"dev": "next dev",
|
||||||
@ -17,6 +16,6 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "17.0.4",
|
"@types/node": "17.0.4",
|
||||||
"@types/react": "17.0.38",
|
"@types/react": "17.0.38",
|
||||||
"typescript": "4.5.4"
|
"typescript": "^5"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,7 @@ set -e
|
|||||||
RECORD_FILE=tmp.rf.$$
|
RECORD_FILE=tmp.rf.$$
|
||||||
CONFIG_FILE=`mktemp`
|
CONFIG_FILE=`mktemp`
|
||||||
|
|
||||||
CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp"}
|
CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp/next"}
|
||||||
CERC_REPO_REF=${CERC_REPO_REF:-${GITHUB_SHA:-`git log -1 --format="%H"`}}
|
CERC_REPO_REF=${CERC_REPO_REF:-${GITHUB_SHA:-`git log -1 --format="%H"`}}
|
||||||
CERC_IS_LATEST_RELEASE=${CERC_IS_LATEST_RELEASE:-"true"}
|
CERC_IS_LATEST_RELEASE=${CERC_IS_LATEST_RELEASE:-"true"}
|
||||||
|
|
||||||
@ -23,8 +23,8 @@ services:
|
|||||||
restEndpoint: '${CERC_REGISTRY_REST_ENDPOINT:-http://console.laconic.com:1317}'
|
restEndpoint: '${CERC_REGISTRY_REST_ENDPOINT:-http://console.laconic.com:1317}'
|
||||||
gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://console.laconic.com:9473/api}'
|
gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://console.laconic.com:9473/api}'
|
||||||
chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic_9000-1}
|
chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic_9000-1}
|
||||||
gas: 550000
|
gas: 2950000
|
||||||
fees: 200000aphoton
|
fees: 400000aphoton
|
||||||
EOF
|
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}')
|
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}')
|
||||||
@ -42,7 +42,8 @@ record:
|
|||||||
homepage: "$rcd_homepage"
|
homepage: "$rcd_homepage"
|
||||||
license: "$rcd_license"
|
license: "$rcd_license"
|
||||||
author: "$rcd_author"
|
author: "$rcd_author"
|
||||||
repository: "$rcd_repository"
|
repository:
|
||||||
|
- "$rcd_repository"
|
||||||
repository_ref: "$CERC_REPO_REF"
|
repository_ref: "$CERC_REPO_REF"
|
||||||
app_version: "$rcd_app_version"
|
app_version: "$rcd_app_version"
|
||||||
app_type: "$CERC_APP_TYPE"
|
app_type: "$CERC_APP_TYPE"
|
||||||
@ -53,13 +54,16 @@ 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')
|
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
|
echo $RECORD_ID
|
||||||
|
|
||||||
if [ -n "$CERC_REGISTRY_APP_CRN" ]; then
|
if [ -z "$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"
|
authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//')
|
||||||
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"
|
app=$(echo "$rcd_name" | cut -d'/' -f2-)
|
||||||
if [ "true" == "$CERC_IS_LATEST_RELEASE" ]; then
|
CERC_REGISTRY_APP_CRN="crn://$authority/applications/$app"
|
||||||
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
|
||||||
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
|
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
|
fi
|
||||||
|
|
||||||
rm -f $RECORD_FILE $CONFIG_FILE
|
rm -f $RECORD_FILE $CONFIG_FILE
|
||||||
|
54
scripts/request-app-deployment.sh
Executable file
54
scripts/request-app-deployment.sh
Executable file
@ -0,0 +1,54 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
RECORD_FILE=tmp.rf.$$
|
||||||
|
CONFIG_FILE=`mktemp`
|
||||||
|
|
||||||
|
rcd_name=$(jq -r '.name' package.json | sed 's/null//' | sed 's/^@//')
|
||||||
|
rcd_app_version=$(jq -r '.version' package.json | sed 's/null//')
|
||||||
|
|
||||||
|
cat <<EOF > "$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: 2950000
|
||||||
|
fees: 400000aphoton
|
||||||
|
EOF
|
||||||
|
|
||||||
|
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
|
||||||
|
|
||||||
|
APP_RECORD=$(laconic -c $CONFIG_FILE cns name resolve "$CERC_REGISTRY_APP_CRN" | jq '.[0]')
|
||||||
|
if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
|
||||||
|
echo "No record found for $CERC_REGISTRY_APP_CRN."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
cat <<EOF | sed '/.*: ""$/d' > "$RECORD_FILE"
|
||||||
|
record:
|
||||||
|
type: ApplicationDeploymentRequest
|
||||||
|
version: 1.0.0
|
||||||
|
name: "$rcd_name@$rcd_app_version"
|
||||||
|
application: "$CERC_REGISTRY_APP_CRN@$rcd_app_version"
|
||||||
|
dns: "$CERC_REGISTRY_DEPLOYMENT_SHORT_HOSTNAME"
|
||||||
|
deployment: "$CERC_REGISTRY_DEPLOYMENT_CRN"
|
||||||
|
config:
|
||||||
|
env:
|
||||||
|
CERC_WEBAPP_DEBUG: "$rcd_app_version"
|
||||||
|
meta:
|
||||||
|
note: "Added by CI @ `date`"
|
||||||
|
repository: "`git remote get-url origin`"
|
||||||
|
repository_ref: "${GITHUB_SHA:-`git log -1 --format="%H"`}"
|
||||||
|
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
|
||||||
|
|
||||||
|
rm -f $RECORD_FILE $CONFIG_FILE
|
@ -1,20 +1,26 @@
|
|||||||
{
|
{
|
||||||
"compilerOptions": {
|
"compilerOptions": {
|
||||||
"target": "es5",
|
|
||||||
"lib": ["dom", "dom.iterable", "esnext"],
|
"lib": ["dom", "dom.iterable", "esnext"],
|
||||||
"allowJs": true,
|
"allowJs": true,
|
||||||
"skipLibCheck": true,
|
"skipLibCheck": true,
|
||||||
"strict": true,
|
"strict": true,
|
||||||
"forceConsistentCasingInFileNames": true,
|
|
||||||
"noEmit": true,
|
"noEmit": true,
|
||||||
"esModuleInterop": true,
|
"esModuleInterop": true,
|
||||||
"module": "esnext",
|
"module": "esnext",
|
||||||
"moduleResolution": "node",
|
"moduleResolution": "bundler",
|
||||||
"resolveJsonModule": true,
|
"resolveJsonModule": true,
|
||||||
"isolatedModules": true,
|
"isolatedModules": true,
|
||||||
"jsx": "preserve",
|
"jsx": "preserve",
|
||||||
"incremental": true
|
"incremental": true,
|
||||||
|
"plugins": [
|
||||||
|
{
|
||||||
|
"name": "next"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"paths": {
|
||||||
|
"@/*": ["./src/*"]
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
|
"include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
|
||||||
"exclude": ["node_modules"]
|
"exclude": ["node_modules"]
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user