Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert manifest file back to yaml, update CI, postgres version #43

Merged
merged 4 commits into from
Oct 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
20 changes: 20 additions & 0 deletions .github/scripts/ci.tsconfig.json
Original file line number Diff line number Diff line change
@@ -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-ethereum/dist/global.d.ts"
]
}
13 changes: 13 additions & 0 deletions .github/scripts/copy-ts-config.sh
Original file line number Diff line number Diff line change
@@ -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
10 changes: 7 additions & 3 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,13 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: 18
- name: setup workspace
run: cp .github/scripts/ci.package.json package.json
# Do this before yarn to avoid node_modules directory
- name: update tsconfigs for workspace
run: ./.github/scripts/copy-ts-config.sh
- run: yarn
- name: codegen
run: yarn codegen
# Need to update tsconfig inputs paths for this to work
# - name: build
# run: yarn build
- name: build
run: yarn build
1 change: 1 addition & 0 deletions Arbitrum/arbitrum-nova-starter/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ package-lock.json
target/
dist/
src/types
#project.yaml

# JetBrains IDE
.idea/
Expand Down
4 changes: 2 additions & 2 deletions Arbitrum/arbitrum-nova-starter/docker/pg-Dockerfile
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
2 changes: 1 addition & 1 deletion Arbitrum/arbitrum-nova-starter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
"@subql/testing": "latest",
"@subql/node-ethereum": "latest",
"ethers": "^5.7.2",
"typescript": "4.5.5"
"typescript": "latest"
}
}
90 changes: 0 additions & 90 deletions Arbitrum/arbitrum-nova-starter/project.ts

This file was deleted.

3 changes: 0 additions & 3 deletions Arbitrum/arbitrum-nova-starter/project.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# NOTE THIS FILE IS HAS BEEN DEPRECATED AND REPLACED BY THE TYPESCRIPT DEFINITION (PROJECT.TS)
# The CLI will automatically look for the project.ts as priority, if you want to ensure you
# use the project manifest, please delete project.ts

specVersion: "1.0.0"

Expand Down
1 change: 1 addition & 0 deletions Arbitrum/arbitrum-one-starter/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ package-lock.json
target/
dist/
src/types
#project.yaml

# JetBrains IDE
.idea/
Expand Down
4 changes: 2 additions & 2 deletions Arbitrum/arbitrum-one-starter/docker/pg-Dockerfile
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -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
2 changes: 1 addition & 1 deletion Arbitrum/arbitrum-one-starter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
"@subql/testing": "latest",
"@subql/node-ethereum": "latest",
"ethers": "^5.7.2",
"typescript": "4.5.5"
"typescript": "latest"
}
}
90 changes: 0 additions & 90 deletions Arbitrum/arbitrum-one-starter/project.ts

This file was deleted.

3 changes: 0 additions & 3 deletions Arbitrum/arbitrum-one-starter/project.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
# NOTE THIS FILE IS HAS BEEN DEPRECATED AND REPLACED BY THE TYPESCRIPT DEFINITION (PROJECT.TS)
# The CLI will automatically look for the project.ts as priority, if you want to ensure you
# use the project manifest, please delete project.ts

specVersion: "1.0.0"

Expand Down
1 change: 1 addition & 0 deletions Arbitrum/arbitrum-one-winr/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ package-lock.json
target/
dist/
src/types
#project.yaml

# JetBrains IDE
.idea/
Expand Down
5 changes: 4 additions & 1 deletion Arbitrum/arbitrum-one-winr/docker/pg-Dockerfile
Original file line number Diff line number Diff line change
@@ -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'
Expand All @@ -7,3 +7,6 @@ ENV POSTGRES_PASSWORD 'postgres'

# Copy in the load-extensions script
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
2 changes: 1 addition & 1 deletion Arbitrum/arbitrum-one-winr/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@
"@subql/testing": "latest",
"@subql/node-ethereum": "latest",
"ethers": "^5.7.2",
"typescript": "4.5.5"
"typescript": "latest"
}
}
Loading