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

Data tables v1 merge #2145

Merged
merged 11 commits into from
Dec 23, 2024
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
60 changes: 60 additions & 0 deletions .github/workflows/production-publish-images.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: Build and Publish Images to ECR

on:
push:
branches:
- self-hosting-setup #remove
- main

concurrency:
group: production-publish-images

jobs:
publish_images:
runs-on: ubuntu-latest-8-cores
strategy:
matrix:
service: [multiplayer, files, connection, client, api]
steps:
- uses: actions/checkout@v4

- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1

- name: Login to Amazon ECR Public
id: login-ecr
uses: aws-actions/amazon-ecr-login@v2
with:
registry-type: public

- name: Define repository name
id: repo-name
run: |
echo "REPO_NAME=quadratic-${{ matrix.service }}" >> $GITHUB_OUTPUT

- name: Create Public ECR Repository if not exists
id: create-ecr
env:
REPO_NAME: ${{ steps.repo-name.outputs.REPO_NAME }}
run: |
aws ecr-public create-repository --repository-name $REPO_NAME || true
REPO_INFO=$(aws ecr-public describe-repositories --repository-names $REPO_NAME)
ECR_URL=$(echo $REPO_INFO | jq -r '.repositories[0].repositoryUri')
echo "ECR_URL=$ECR_URL" >> $GITHUB_OUTPUT

- name: Read VERSION file
id: version
run: echo "VERSION=$(cat VERSION)" >> $GITHUB_OUTPUT

- name: Build, Tag, and Push Image to Amazon ECR Public
env:
ECR_URL: ${{ steps.create-ecr.outputs.ECR_URL }}
IMAGE_TAG: ${{ steps.version.outputs.VERSION }}
run: |
docker build -t $ECR_URL:$IMAGE_TAG -t $ECR_URL:latest -f quadratic-${{ matrix.service }}/Dockerfile .
docker push $ECR_URL:$IMAGE_TAG
docker push $ECR_URL:latest
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,15 @@ quadratic-connection/target/
quadratic-core/target/
quadratic-core/tmp.txt
quadratic-files/target/
quadratic-files/storage
quadratic-multiplayer/target/

quadratic-multiplayer/updateAlertVersion.json
<<<<<<< HEAD
quadratic-rust-shared/src/auto_gen_path.rs
=======
quadratic-shared/src/auto_gen_path.rs
>>>>>>> origin/qa

# Generated JS files
quadratic-api/node_modules/
Expand All @@ -66,6 +71,7 @@ docker/mysql/data
docker/postgres/data
docker/redis/data
docker/static/html
docker/file-storage
docker/postgres-connection/data
docker/mysql-connection/data
docker/snowflake-connection/data
Expand Down
21 changes: 21 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,26 @@
"editor.formatOnSave": true,
"cSpell.words": [
"actix",
"ayush",
"bigdecimal",
"bincode",
"bindgen",
<<<<<<< HEAD
"cellvalue",
=======
"CRPXNLSKVLJFHH",
>>>>>>> origin/qa
"dashmap",
"dbgjs",
"dcell",
"ddimaria",
"dgraph",
"dotenv",
"endregion",
"finitize",
"Fuzzysort",
"GETCELL",
"getcells",
"gramm",
"grammarly",
"Hasher",
Expand All @@ -27,6 +35,7 @@
"jwks",
"MDSL",
"micropip",
"minmax",
"msdf",
"nonblank",
"Northbridge",
Expand All @@ -35,10 +44,14 @@
"peekable",
"pixi",
"pixiapp",
"Plotly",
"pulumi",
"pyimport",
"rects",
"RELCELL",
"relcells",
"reqwest",
"scrollend",
"shadcn",
"Signin",
"smallpop",
Expand All @@ -47,6 +60,7 @@
"szhsin",
"thiserror",
"Timelike",
"trackpad",
"undoable",
"unspill",
"vals",
Expand All @@ -56,6 +70,10 @@
"editor.codeActionsOnSave": {
"source.organizeImports": "explicit"
},
<<<<<<< HEAD
=======
"rust-analyzer.check.extraArgs": ["--target-dir=target/rust-analyzer"],
>>>>>>> origin/qa
"rust-analyzer.checkOnSave": true,
"rust-analyzer.cargo.unsetTest": true,
// "rust-analyzer.checkOnSave.command": "clippy",
Expand Down Expand Up @@ -92,5 +110,8 @@
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[html]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
}
}
Loading
Loading