Skip to content

Commit 0e03409

Browse files
committed
Merge branch 'main' into beta
2 parents 8dd94a8 + bab5725 commit 0e03409

File tree

10 files changed

+2898
-3161
lines changed

10 files changed

+2898
-3161
lines changed

.aws/task-definition-beta-coin.json

Lines changed: 0 additions & 61 deletions
This file was deleted.

.aws/task-definition-beta.json

Lines changed: 0 additions & 61 deletions
This file was deleted.

.aws/task-definition-prod-coin.json

Lines changed: 0 additions & 61 deletions
This file was deleted.

.aws/task-definition-prod.json

Lines changed: 0 additions & 61 deletions
This file was deleted.

.github/workflows/deploy-beta-coin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
IMAGE_TAG: ${{ github.sha }}
7878
run: |
7979
kubectl --namespace ${{ vars.COIN_NODE_NAMESPACE }} set image deployment/deployment app=$ECR_REGISTRY/${ECR_REPOSITORY}:${IMAGE_TAG}
80-
kubectl rollout status deployment
80+
kubectl --namespace ${{ vars.NAMESPACE }} rollout status deployment/deployment --timeout=5m
8181
8282
- name: invalidate cloudfront distribution and wait for completion
8383
run: |

.github/workflows/deploy-beta.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ jobs:
2222

2323
- name: Set up Docker Buildx
2424
id: buildx
25-
uses: docker/setup-buildx-action@v2
25+
uses: docker/setup-buildx-action@v3
2626
with:
27-
config-inline: |
27+
buildkitd-config-inline: |
2828
[worker.oci]
2929
max-parallelism = 4
3030
@@ -57,7 +57,7 @@ jobs:
5757
ECR_REPOSITORY: ${{ secrets.ECR_REPOSITORY }}
5858
IMAGE_TAG: ${{ github.sha }}
5959
run: |
60-
docker build -t ${ECR_REGISTRY}/${ECR_REPOSITORY}:${IMAGE_TAG} .
60+
docker build --platform linux/amd64,linux/arm64 -t ${ECR_REGISTRY}/${ECR_REPOSITORY}:${IMAGE_TAG} .
6161
docker push ${ECR_REGISTRY}/${ECR_REPOSITORY}:${IMAGE_TAG}
6262
6363
- name: Install kubectl
@@ -77,7 +77,7 @@ jobs:
7777
IMAGE_TAG: ${{ github.sha }}
7878
run: |
7979
kubectl --namespace ${{ vars.NAMESPACE }} set image deployment/deployment app=$ECR_REGISTRY/${ECR_REPOSITORY}:${IMAGE_TAG}
80-
kubectl rollout status deployment
80+
kubectl --namespace ${{ vars.NAMESPACE }} rollout status deployment/deployment --timeout=5m
8181
8282
- name: invalidate cloudfront distribution and wait for completion
8383
run: |

.github/workflows/deploy-prod-coin.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
IMAGE_TAG: ${{ github.sha }}
7878
run: |
7979
kubectl --namespace ${{ vars.COIN_NODE_NAMESPACE }} set image deployment/deployment app=$ECR_REGISTRY/${ECR_REPOSITORY}:${IMAGE_TAG}
80-
kubectl rollout status deployment
80+
kubectl --namespace ${{ vars.NAMESPACE }} rollout status deployment/deployment --timeout=5m
8181
8282
- name: invalidate cloudfront distribution and wait for completion
8383
run: |

.github/workflows/deploy-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ jobs:
7676
IMAGE_TAG: ${{ github.sha }}
7777
run: |
7878
kubectl --namespace ${{ vars.NAMESPACE }} set image deployment/deployment app=$ECR_REGISTRY/${ECR_REPOSITORY}:${IMAGE_TAG}
79-
kubectl rollout status deployment
79+
kubectl --namespace ${{ vars.NAMESPACE }} rollout status deployment/deployment --timeout=5m
8080
8181
- name: invalidate cloudfront distribution and wait for completion
8282
run: |

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,29 @@
3333
"test:ci": "jest --runInBand --coverage --forceExit --passWithNoTests"
3434
},
3535
"dependencies": {
36-
"@xyo-network/node-app": "^3.1.4",
36+
"@xyo-network/node-app": "^3.1.5",
3737
"lodash-es": "^4.17.21"
3838
},
3939
"devDependencies": {
4040
"@babel/core": "^7.26.0",
4141
"@babel/preset-env": "^7.26.0",
4242
"@babel/preset-typescript": "^7.26.0",
4343
"@types/jest": "^29.5.14",
44-
"@types/node": "^22.9.1",
44+
"@types/node": "^22.10.1",
4545
"@types/source-map-support": "0.5.10",
46-
"@typescript-eslint/eslint-plugin": "^8.15.0",
47-
"@typescript-eslint/parser": "^8.15.0",
46+
"@typescript-eslint/eslint-plugin": "^8.17.0",
47+
"@typescript-eslint/parser": "^8.17.0",
4848
"@xylabs/eslint-config-flat": "^4.2.4",
4949
"@xylabs/ts-scripts-yarn3": "^4.2.4",
5050
"@xylabs/tsconfig": "^4.2.4",
5151
"@xylabs/tsconfig-jest": "^4.1.0",
5252
"babel-jest": "^29.7.0",
5353
"depcheck": "^1.4.7",
54-
"eslint": "^9.15.0",
54+
"eslint": "^9.16.0",
5555
"eslint-import-resolver-typescript": "^3.6.3",
5656
"jest-extended": "^4.0.2",
5757
"nodemon": "^3.1.7",
58-
"typescript": "^5.6.3"
58+
"typescript": "^5.7.2"
5959
},
6060
"packageManager": "[email protected]",
6161
"engines": {

0 commit comments

Comments
 (0)