Replace project.ts with project.yaml, update postgres version

subquery · Oct 9, 2023 · ece088e · ece088e
1 parent 468cb71
commit ece088e
Show file tree

Hide file tree

Showing 108 changed files with 121 additions and 2,319 deletions.
diff --git a/package.json → .github/scripts/ci.package.json b/package.json → .github/scripts/ci.package.json
diff --git a/.github/scripts/ci.tsconfig.json b/.github/scripts/ci.tsconfig.json
@@ -0,0 +1,20 @@
+{
+  "compilerOptions": {
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "esModuleInterop": true,
+    "declaration": true,
+    "importHelpers": true,
+    "resolveJsonModule": true,
+    "module": "commonjs",
+    "outDir": "dist",
+    "rootDir": "src",
+    "target": "es2017",
+    "strict": true
+  },
+  "include": [
+    "src/**/*",
+    "../../node_modules/@subql/types-core/dist/global.d.ts",
+    "../../node_modules/@subql/types-cosmos/dist/global.d.ts"
+  ]
+}
diff --git a/.github/scripts/copy-ts-config.sh b/.github/scripts/copy-ts-config.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# This file copies over a modified TS config that works with workspaces so we can build all projects
+
+set -e
+
+for DEST_PATH in ./*/*/; do
+
+  SRC="./github/scripts/ci.tsconfig.json"
+  DEST="${DEST_PATH}tsconfig.json"
+
+  [ -f "$DEST" ] && cp "$SRC" "$DEST"
+done
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -13,9 +13,12 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: 18
+      - name: setup workspace
+        run: cp ci.package.json package.json
       - run: yarn
       - name: codegen
         run: yarn codegen
-    #  Need to update tsconfig inputs paths for this to work
-    # - name: build
-    #   run: yarn build
+      - name: update tsconfigs for workspace
+        run: .github/scripts/copy-ts-config.sh
+      - name: build
+        run: yarn build
diff --git a/Agoric/agoric-starter/.gitignore b/Agoric/agoric-starter/.gitignore
@@ -28,7 +28,7 @@ package-lock.json
 target/
 dist/
 src/types
-project.yaml
+# project.yaml
 
 # JetBrains IDE
 .idea/

diff --git a/Agoric/agoric-starter/docker/pg-Dockerfile b/Agoric/agoric-starter/docker/pg-Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:12-alpine
+FROM postgres:16-alpine
 
 # Variables needed at runtime to configure postgres and run the initdb scripts
 ENV POSTGRES_DB 'postgres'
@@ -9,4 +9,4 @@ ENV POSTGRES_PASSWORD 'postgres'
 COPY docker/load-extensions.sh /docker-entrypoint-initdb.d/
 
 # Convert line endings to LF
-RUN sed -i 's/\r$//' /docker-entrypoint-initdb.d/load-extensions.sh && chmod +x /docker-entrypoint-initdb.d/load-extensions.sh
+RUN sed -i 's/\r$//' /docker-entrypoint-initdb.d/load-extensions.sh && chmod +x /docker-entrypoint-initdb.d/load-extensions.sh
diff --git a/Agoric/agoric-starter/project.ts b/Agoric/agoric-starter/project.ts
diff --git a/Agoric/agoric-starter/project-old.yaml → Agoric/agoric-starter/project.yaml b/Agoric/agoric-starter/project-old.yaml → Agoric/agoric-starter/project.yaml
diff --git a/Akash/akash-starter/.gitignore b/Akash/akash-starter/.gitignore
@@ -28,7 +28,7 @@ package-lock.json
 target/
 dist/
 src/types
-project.yaml
+# project.yaml
 
 # JetBrains IDE
 .idea/

diff --git a/Akash/akash-starter/docker/pg-Dockerfile b/Akash/akash-starter/docker/pg-Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:12-alpine
+FROM postgres:16-alpine
 
 # Variables needed at runtime to configure postgres and run the initdb scripts
 ENV POSTGRES_DB 'postgres'
@@ -9,4 +9,4 @@ ENV POSTGRES_PASSWORD 'postgres'
 COPY docker/load-extensions.sh /docker-entrypoint-initdb.d/
 
 # Convert line endings to LF
-RUN sed -i 's/\r$//' /docker-entrypoint-initdb.d/load-extensions.sh && chmod +x /docker-entrypoint-initdb.d/load-extensions.sh
+RUN sed -i 's/\r$//' /docker-entrypoint-initdb.d/load-extensions.sh && chmod +x /docker-entrypoint-initdb.d/load-extensions.sh
diff --git a/Akash/akash-starter/project.ts b/Akash/akash-starter/project.ts
diff --git a/Akash/akash-starter/project-old.yaml → Akash/akash-starter/project.yaml b/Akash/akash-starter/project-old.yaml → Akash/akash-starter/project.yaml
diff --git a/Archway/archway-starter/.gitignore b/Archway/archway-starter/.gitignore
@@ -28,7 +28,7 @@ package-lock.json
 target/
 dist/
 src/types
-project.yaml
+# project.yaml
 
 # JetBrains IDE
 .idea/

diff --git a/Archway/archway-starter/docker/pg-Dockerfile b/Archway/archway-starter/docker/pg-Dockerfile
@@ -1,4 +1,4 @@
-FROM postgres:12-alpine
+FROM postgres:16-alpine
 
 # Variables needed at runtime to configure postgres and run the initdb scripts
 ENV POSTGRES_DB 'postgres'
@@ -9,4 +9,4 @@ ENV POSTGRES_PASSWORD 'postgres'
 COPY docker/load-extensions.sh /docker-entrypoint-initdb.d/
 
 # Convert line endings to LF
-RUN sed -i 's/\r$//' /docker-entrypoint-initdb.d/load-extensions.sh && chmod +x /docker-entrypoint-initdb.d/load-extensions.sh
+RUN sed -i 's/\r$//' /docker-entrypoint-initdb.d/load-extensions.sh && chmod +x /docker-entrypoint-initdb.d/load-extensions.sh
diff --git a/Archway/archway-starter/project.ts b/Archway/archway-starter/project.ts
diff --git a/Archway/archway-starter/project-old.yaml → Archway/archway-starter/project.yaml b/Archway/archway-starter/project-old.yaml → Archway/archway-starter/project.yaml