dont run jobs in parallel

Reviewed-on: zramsay/test-progressive-web-app#1

.gitea/workflows/publish.yaml

@@ -4,28 +4,73 @@ on:
     types: [published]
 
 env:
-  CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_LACONIC_USER_KEY }}
-  CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_LACONIC_BOND_ID }}
+  DOCKER_HOST: unix:///var/run/dind.sock
 
 jobs:
-  cns_publish:
+  setup_deps:
+    name: "Install project and dependencies"
     runs-on: ubuntu-latest
     steps:
       - name: "Clone project repository"
         uses: actions/checkout@v3
+
+ # At present the stock setup-python action fails on Linux/aarch64
+        # Conditional steps below workaroud this by using deadsnakes for that case only
+      - name: "Install Python for ARM on Linux"
+        if: ${{ runner.arch == 'arm64' && runner.os == 'Linux' }}
+        uses: deadsnakes/action@v3.0.1
+        with:
+          python-version: '3.8'
+      
+      - name: "Install Python cases other than ARM on Linux"
+        if: ${{ ! (runner.arch == 'arm64' && runner.os == 'Linux') }}
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.8'
+      
+      - name: "Print Python version"
+        run: python3 --version
+
+      - name: "Install Stack Orchestrator"
+        run: |
+          mkdir -p /opt/laconic
+          curl -o /opt/laconic/quick-install-linux.sh https://raw.githubusercontent.com/cerc-io/stack-orchestrator/main/scripts/quick-install-linux.sh
+          chmod +x /opt/laconic/quick-install-linux.sh
+          CERC_SO_INSTALL_SKIP_PACKAGES=true /opt/laconic/quick-install-linux.sh -y
+          source ~/.profile
+          laconic-so version
+
+      - name: "Start dockerd" # Also needed until we can incorporate into the executor
+        run: |
+          dockerd -H $DOCKER_HOST --userland-proxy=false &
+          sleep 5
+      
+      - name: "Use laconic-so"
+        run: |
+          source ~/.profile
+          laconic-so --stack uniswap-urbit-app setup-repositories --pull
+          laconic-so --stack uniswap-urbit-app build-containers
+        # laconic-so --stack uniswap-urbit-app deploy init --output uniswap-urbit-app-spec.yml
+        # edit the above .yml file
+        # laconic-so --stack uniswap-urbit-app deploy create --spec-file uniswap-urbit-app-spec.yml --deployment-dir uniswap-urbit-app-deployment
+        # edit the config file
+        # laconic-so deployment --dir uniswap-urbit-app-deployment start
+
       - name: Use Node.js
         uses: actions/setup-node@v3
         with:
           node-version: 18
-      - name: "Enable Yarn"
-        run: corepack enable
+      - 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/
-          npm install -g @cerc-io/laconic-registry-cli@0.1.13
+          yarn global add @cerc-io/laconic-registry-cli
       - name: "Install jq"
         run: apt -y update && apt -y install jq
-      - name: "Publish Application Record"
+      - name: "Publish 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://urbit/applications/uniswap"
         run: scripts/publish-app-record.sh
-      - name: "Request Deployment"
-        run: scripts/request-app-deployment.sh

next.config.js

@@ -1,13 +1,12 @@
-import withPWA from 'next-pwa';
+/** @type {import('next').NextConfig} */
+const withPWA = require('next-pwa')({
+  dest: 'public',
+})
 
-const config = {
+module.exports = withPWA({
   env: {
     CERC_TEST_WEBAPP_CONFIG1: process.env.CERC_TEST_WEBAPP_CONFIG1,
     CERC_TEST_WEBAPP_CONFIG2: process.env.CERC_TEST_WEBAPP_CONFIG2,
     CERC_WEBAPP_DEBUG: process.env.CERC_WEBAPP_DEBUG,
-  }
-};
-
-const nextConfig = withPWA({ dest: 'public' })(config);
-
-export default nextConfig;
+  },
+})

package.json

@@ -1,7 +1,8 @@
 {
-  "name": "@cerc-io/test-progressive-web-app",
-  "version": "0.1.53",
-  "repository": "https://git.vdb.to/cerc-io/test-progressive-web-app",
+  "private": true,
+  "name": "@zramsay/test-progressive-web-app",
+  "version": "0.1.6",
+  "repository": "https://git.vdb.to/zramsay/test-progressive-web-app/",
   "scripts": {
     "dev": "next dev",
     "build": "next build",
@@ -16,6 +17,6 @@
   "devDependencies": {
     "@types/node": "17.0.4",
     "@types/react": "17.0.38",
-    "typescript": "^5"
+    "typescript": "4.5.4"
   }
 }

scripts/publish-app-record.sh

@@ -5,7 +5,7 @@ set -e
 RECORD_FILE=tmp.rf.$$
 CONFIG_FILE=`mktemp`
 
-CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp/next"}
+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"}
 
@@ -23,8 +23,8 @@ services:
     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
+    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}')
@@ -42,8 +42,7 @@ record:
   homepage: "$rcd_homepage"
   license: "$rcd_license"
   author: "$rcd_author"
-  repository:
-    - "$rcd_repository"
+  repository: "$rcd_repository"
   repository_ref: "$CERC_REPO_REF"
   app_version: "$rcd_app_version"
   app_type: "$CERC_APP_TYPE"
@@ -54,16 +53,13 @@ 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"
+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

scripts/request-app-deployment.sh

@@ -1,54 +0,0 @@
-#!/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

tsconfig.json

@@ -1,26 +1,20 @@
 {
   "compilerOptions": {
+    "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,
     "skipLibCheck": true,
     "strict": true,
+    "forceConsistentCasingInFileNames": true,
     "noEmit": true,
     "esModuleInterop": true,
     "module": "esnext",
-    "moduleResolution": "bundler",
+    "moduleResolution": "node",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "jsx": "preserve",
-    "incremental": true,
-    "plugins": [
-      {
-        "name": "next"
-      }
-    ],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
+    "incremental": true
   },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx"],
   "exclude": ["node_modules"]
 }