Skip to content

Commit c5d94bf

Browse files
VladislavKudrinVladislavKudrin
authored
Merge pull request #944 from cardano-foundation/chore/prepare-8-4-1
WIP: prepare 8.4.1
2 parents 88ba43e + 822f56b commit c5d94bf

File tree

14 files changed

+49
-104
lines changed

14 files changed

+49
-104
lines changed

‎.env.docker-compose‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ NETWORK=mainnet
33
COMPOSE_PROFILES=token-registry
44

55
## Postgres Variables
6-
POSTGRES_VERSION=14.10-alpine
6+
POSTGRES_VERSION=17.2-alpine
77
POSTGRES_PORT=5432
88
DB_PATH=postgres14-data
99

@@ -33,10 +33,10 @@ CARDANO_DB_SYNC_DIR=db-sync-data
3333

3434
## Hasura Variables
3535
HASURA_PORT=8090
36-
CARDANO_GRAPHQL_VERSION=8.4.0
36+
CARDANO_GRAPHQL_VERSION=8.4.1
3737

3838
## Token Registry Variables
39-
TOKEN_REGISTRY_VERSION=1.3.0
39+
TOKEN_REGISTRY_VERSION=1.3.1
4040
TOKEN_REGISTRY_PORT=8080
4141

4242
## Background Variables

‎.env.docker-compose-preprod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ NETWORK=preprod
33
COMPOSE_PROFILES=token-registry
44

55
## Postgres Variables
6-
POSTGRES_VERSION=14.10-alpine
6+
POSTGRES_VERSION=17.2-alpine
77
POSTGRES_PORT=5433
88
DB_PATH=/opt/graph-ql-preprod/sql_data
99

@@ -33,10 +33,10 @@ CARDANO_DB_SYNC_DIR=/opt/graph-ql-preprod/db-sync-data
3333

3434
## Hasura Variables
3535
HASURA_PORT=8091
36-
CARDANO_GRAPHQL_VERSION=8.3.3
36+
CARDANO_GRAPHQL_VERSION=8.4.1
3737

3838
## Token Registry Variables
39-
TOKEN_REGISTRY_VERSION=1.3.0
39+
TOKEN_REGISTRY_VERSION=1.3.1
4040
TOKEN_REGISTRY_PORT=8080
4141

4242
## Background Variables

‎.github/workflows/post_integration.yml‎

Lines changed: 18 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@ on:
66
- master
77

88
jobs:
9-
push-docker-build:
10-
strategy:
11-
matrix:
12-
os: [ ubuntu-24.04 ]
13-
network: [ "mainnet", "preprod", "preview", "sanchonet" ]
14-
15-
runs-on: ${{ matrix.os }}
9+
build:
10+
runs-on: ubuntu-latest
1611
steps:
1712
- name: 📥 Checkout repository
1813
uses: actions/[email protected]
@@ -21,62 +16,44 @@ jobs:
2116

2217
- name: 🧰 Set up Docker Buildx
2318
uses: docker/setup-buildx-action@v1
24-
19+
20+
- name: 🧰 Setup Node.js
21+
uses: actions/setup-node@v1
22+
with:
23+
node-version: 14
24+
2525
- name: 🐳 Login to DockerHub
2626
uses: docker/login-action@v1
2727
with:
2828
username: ${{ secrets.DOCKER_HUB_USERNAME }}
2929
password: ${{ secrets.DOCKER_HUB_TOKEN }}
30-
30+
3131
- name: 📝 Base Variables
3232
id: base-variables
3333
run: |
3434
echo ::set-output name=cardano-graphql-image::cardanofoundation/cardano-graphql
3535
echo ::set-output name=cardano-graphql-hasura-image::cardanofoundation/cardano-graphql-hasura
3636
echo ::set-output name=cardano-graphql-background-image::cardanofoundation/cardano-graphql-background
3737
echo ::set-output name=cardano-graphql-server-image::cardanofoundation/cardano-graphql-server
38-
39-
- name: 🔨 Build and push Cardano GraphQL Server Dockerfile (default)
40-
if: ${{ matrix.network == 'mainnet' }}
38+
39+
- name: Server - Build and push Docker master image
4140
uses: docker/build-push-action@v2
4241
with:
43-
build-args: NETWORK=${{ matrix.network }}
44-
context: .
4542
push: true
46-
tags: ${{ steps.base-variables.outputs.cardano-graphql-image }}:${{ github.sha }}, ${{ steps.base-variables.outputs.cardano-graphql-image }}:master
43+
tags: cardanofoundation/cardano-graphql-server:master
4744
target: server
48-
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-image }}:latest
49-
cache-to: type=inline
5045

51-
- name: 🔨 Build and push Cardano GraphQL Server Dockerfile (network)
46+
- name: Background - Build and push Docker master image
5247
uses: docker/build-push-action@v2
5348
with:
54-
build-args: NETWORK=${{ matrix.network }}
55-
context: .
5649
push: true
57-
tags: ${{ steps.base-variables.outputs.cardano-graphql-server-image }}:${{ github.sha }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-server-image }}:master-${{ matrix.network }}
58-
target: server
59-
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-server-image }}:master-${{ matrix.network }}
60-
cache-to: type=inline
61-
62-
- name: 🔨 Build and push Cardano GraphQL Hasura Dockerfile
50+
tags: cardanofoundation/cardano-graphql-background:master
51+
target: background
52+
53+
- name: Hasura - Build and push Docker master image
6354
uses: docker/build-push-action@v2
6455
with:
65-
build-args: NETWORK=${{ matrix.network }}
6656
context: ./packages/api-cardano-db-hasura/hasura
6757
file: ./packages/api-cardano-db-hasura/hasura/Dockerfile
6858
push: true
69-
tags: ${{ steps.base-variables.outputs.cardano-graphql-hasura-image }}:${{ github.sha }}, ${{ steps.base-variables.outputs.cardano-graphql-hasura-image }}:master
70-
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-hasura-image }}:master-${{ matrix.network }}
71-
cache-to: type=inline
72-
73-
- name: 🔨 Build and push Cardano GraphQL Background Dockerfile (network)
74-
uses: docker/build-push-action@v2
75-
with:
76-
build-args: NETWORK=${{ matrix.network }}
77-
context: .
78-
push: true
79-
tags: ${{ steps.base-variables.outputs.cardano-graphql-background-image }}:${{ github.sha }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-background-image }}:master-${{ matrix.network }}
80-
target: server
81-
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-background-image }}:master-${{ matrix.network }}
82-
cache-to: type=inline
59+
tags: cardanofoundation/cardano-graphql-hasura:master

‎.github/workflows/post_release.yml‎

Lines changed: 9 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,8 @@ on:
66
- published
77

88
jobs:
9-
publish:
10-
strategy:
11-
matrix:
12-
os: [ ubuntu-24.04 ]
13-
network: [ "mainnet", "preprod", "preview", "sanchonet" ]
14-
15-
runs-on: ${{ matrix.os }}
9+
build:
10+
runs-on: ubuntu-latest
1611
steps:
1712
- name: 📥 Checkout repository
1813
uses: actions/[email protected]
@@ -41,63 +36,36 @@ jobs:
4136
echo ::set-output name=cardano-graphql-background-image::cardanofoundation/cardano-graphql-background
4237
echo ::set-output name=cardano-graphql-server-image::cardanofoundation/cardano-graphql-server
4338
44-
- name: 🔨 Build and push Cardano GraphQL Server Dockerfile (default)
45-
if: ${{ matrix.network == 'mainnet' }}
39+
- name: Server - Build and push Docker ${{ github.event.release.tag_name }} image
4640
uses: docker/build-push-action@v2
4741
with:
48-
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-image }}:latest
49-
cache-to: type=inline
5042
push: true
51-
tags: ${{ steps.base-variables.outputs.cardano-graphql-image }}:${{ github.sha }}, ${{ steps.base-variables.outputs.cardano-graphql-image }}:${{ github.event.release.tag_name }}, ${{ steps.base-variables.outputs.cardano-graphql-image }}:latest
43+
tags: cardanofoundation/cardano-graphql-server:${{ github.event.release.tag_name }}
5244
target: server
5345

54-
- name: 🔨 Build and push Cardano GraphQL Server Dockerfile (network tags)
46+
- name: Background - Build and push Docker ${{ github.event.release.tag_name }} image
5547
uses: docker/build-push-action@v2
5648
with:
57-
build-args: NETWORK=${{ matrix.network }}
58-
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-server-image }}:latest
59-
cache-to: type=inline
6049
push: true
61-
tags: ${{ steps.base-variables.outputs.cardano-graphql-server-image }}:${{ github.sha }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-server-image }}:${{ github.event.release.tag_name }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-server-image }}:latest-${{ matrix.network }}
62-
target: server
63-
64-
- name: 🔨 Build and push Cardano GraphQL Server Dockerfile (network tags)
65-
uses: docker/build-push-action@v2
66-
with:
67-
build-args: NETWORK=${{ matrix.network }}
68-
cache-from: type=registry,ref=${{ steps.base-variables.outputs.cardano-graphql-background-image }}:latest
69-
cache-to: type=inline
70-
push: true
71-
tags: ${{ steps.base-variables.outputs.cardano-graphql-background-image }}:${{ github.sha }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-background-image }}:${{ github.event.release.tag_name }}-${{ matrix.network }}, ${{ steps.base-variables.outputs.cardano-graphql-background-image }}:latest-${{ matrix.network }}
50+
tags: cardanofoundation/cardano-graphql-background:${{ github.event.release.tag_name }}
7251
target: background
7352

74-
- name: 🔨 Build and push Cardano GraphQL Hasura Dockerfile
53+
- name: Hasura - Build and push Docker ${{ github.event.release.tag_name }} image
7554
uses: docker/build-push-action@v2
7655
with:
7756
context: ./packages/api-cardano-db-hasura/hasura
7857
file: ./packages/api-cardano-db-hasura/hasura/Dockerfile
7958
push: true
80-
tags: ${{ steps.base-variables.outputs.cardano-graphql-hasura-image }}:${{ github.sha }}, cardanofoundation/cardano-graphql-hasura:${{ github.event.release.tag_name }}, cardanofoundation/cardano-graphql-hasura:latest
81-
82-
# Removed push to npm for now, will add it later again
83-
# - name: 📤 Publish packages to npm registry
84-
# if: ${{ matrix.network == 'mainnet' }}
85-
# run: |
86-
# yarn install --offline --frozen-lockfile --non-interactive --logevel=error
87-
# npx npm-cli-login -u ${{ secrets.NPM_REGISTRY_USER }} -e ${{ secrets.NPM_REGISTRY_EMAIL }} -p ${{ secrets.NPM_REGISTRY_TOKEN }}
88-
# scripts/publish_packages.sh
89-
# rm -f .npmrc
59+
tags: cardanofoundation/cardano-graphql-hasura:${{ github.event.release.tag_name }}
9060

9161
- name: 🔨 Build docs
92-
if: ${{ matrix.network == 'mainnet' }}
9362
run: |
9463
yarn --cwd ./docs install --frozen-lockfile
9564
yarn --cwd ./docs build
9665
env:
9766
SKIP_PREFLIGHT_CHECK: true
98-
67+
9968
- name: 📤 Deploy
100-
if: ${{ matrix.network == 'mainnet' }}
10169
uses: JamesIves/[email protected]
10270
with:
10371
branch: gh-pages

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ CMD ["node", "background.js"]
9595
FROM ubuntu-nodejs AS server
9696
ARG NETWORK=mainnet
9797
ENV \
98-
CARDANO_NODE_CONFIG_PATH=/config/cardano-node/config.json \
98+
CARDANO_NODE_CONFIG_PATH=/config/network/${NETWORK}/cardano-node/config.json \
9999
HASURA_GRAPHQL_ENABLE_TELEMETRY=false \
100100
HASURA_URI="http://hasura:8080" \
101101
LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH" \
@@ -112,7 +112,7 @@ COPY --from=cardano-graphql-builder /app/packages/util/dist /app/packages/util/d
112112
COPY --from=cardano-graphql-builder /app/packages/util/package.json /app/packages/util/package.json
113113
COPY --from=cardano-graphql-production-deps /app/node_modules /app/node_modules
114114
COPY --from=cardano-graphql-production-deps /app/packages/api-cardano-db-hasura/node_modules /app/packages/api-cardano-db-hasura/node_modules
115-
COPY config/network/${NETWORK}/cardano-node /config/cardano-node/
115+
COPY config /config/
116116
WORKDIR /app/packages/server/dist
117117
EXPOSE 3100
118118
CMD ["node", "index.js"]

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Check the [releases] for the latest version.
4040
``` console
4141
git clone \
4242
--single-branch \
43-
--branch 8.4.0 \
43+
--branch 8.4.1 \
4444
--recurse-submodules \
4545
https://github.com/cardano-foundation/cardano-graphql.git \
4646
&& cd cardano-graphql

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"engines": {
55
"node": ">=14.15.0"
66
},
7-
"version": "8.3.2",
7+
"version": "8.4.1",
88
"private": true,
99
"workspaces": [
1010
"packages/*"

‎packages/api-cardano-db-hasura/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cardano-graphql/api-cardano-db-hasura",
3-
"version": "8.0.0",
3+
"version": "8.4.1",
44
"description": "Module for interfacing with the Cardano DB, populated by cardano-db-sync that utilises Hasura for a powerful query interface",
55
"main": "dist/index.js",
66
"typings": "dist/index.d.ts",
@@ -34,7 +34,7 @@
3434
"schema.graphql"
3535
],
3636
"dependencies": {
37-
"@cardano-graphql/util": "8.0.0",
37+
"@cardano-graphql/util": "8.4.1",
3838
"@cardano-ogmios/client": "^6.0.0",
3939
"@cardanosolutions/json-bigint": "^1.0.0",
4040
"@emurgo/cip14-js": "^2.0.0",

‎packages/api-cardano-db-hasura/schema.graphql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1560,7 +1560,7 @@ type StakeRegistration_aggregate_fields {
15601560
}
15611561

15621562
type Token {
1563-
asset: Asset!
1563+
asset: Asset
15641564
quantity: String!
15651565
transactionOutput: TransactionOutput!
15661566
}
@@ -1896,7 +1896,7 @@ type TransactionInput_sum_fields {
18961896

18971897
type TransactionMetadata {
18981898
key: String!
1899-
value: JSON!
1899+
value: JSON
19001900
}
19011901

19021902
input TransactionMetadata_bool_exp {

‎packages/cli/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@cardano-graphql/cli",
3-
"version": "8.0.0",
3+
"version": "8.4.1",
44
"description": "Management tool for managing a Cardano GraphQL deployment",
55
"main": "./dist/index.js",
66
"bin": {

0 commit comments

Comments
 (0)