From 87a4c4c424db46a32c27bac3546cbfd68f0ecf62 Mon Sep 17 00:00:00 2001 From: KtorZ Date: Fri, 8 Nov 2024 18:01:41 +0100 Subject: [PATCH 1/5] Upgrade versions in network-synchronization night workflow. --- .github/workflows/network-synchronization.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/network-synchronization.yaml b/.github/workflows/network-synchronization.yaml index 77807d3df..e508c8b3a 100644 --- a/.github/workflows/network-synchronization.yaml +++ b/.github/workflows/network-synchronization.yaml @@ -16,8 +16,8 @@ jobs: strategy: matrix: network: [ preview ] - ogmios_version: [ v6.6.2 ] - cardano_node_version: [ 9.1.1 ] + ogmios_version: [ v6.9.0 ] + cardano_node_version: [ 10.1.2 ] runs-on: ubuntu-latest steps: From f0a0aea409e60e7dc53164e0839dfc6a4ab85cfa Mon Sep 17 00:00:00 2001 From: Ritudhwaj Ambardekar Date: Tue, 10 Dec 2024 15:16:13 +0530 Subject: [PATCH 2/5] v10.1.3 --- .github/workflows/continuous-integration.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index abd651883..f6764819a 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -227,7 +227,7 @@ jobs: os: [ linux ] arch: [ x86_64 ] network: [ preview ] - cardano-node: [ 10.1.2 ] + cardano-node: [ 10.1.3 ] runs-on: ${{ matrix.os == 'linux' && 'ubuntu-22.04' }} steps: @@ -402,10 +402,10 @@ jobs: strategy: matrix: os: [ linux ] - target: [ cardano-node-ogmios ] + target: [ ogmios ] network: [ mainnet, preprod, preview, sanchonet ] - cardano-node: [ 10.1.2 ] - cardano-node-latest: [ 10.1.2 ] + cardano-node: [ 10.1.3 ] + cardano-node-latest: [ 10.1.3 ] arch: [ x86_64 ] steps: - name: 📥 Checkout repository @@ -433,7 +433,7 @@ jobs: - name: 📝 Base Variables id: base-variables run: | - echo "image=cardanosolutions/${{ matrix.target }}" >> $GITHUB_OUTPUT + echo "image=ritudhwaj/${{ matrix.target }}" >> $GITHUB_OUTPUT - name: 📝 Tag Variables if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') }} From 3eb49b78b3fefd071151bcfa88d6ed8b52ed858c Mon Sep 17 00:00:00 2001 From: Ritudhwaj Ambardekar Date: Tue, 10 Dec 2024 15:51:14 +0530 Subject: [PATCH 3/5] v10.1.3 --- .github/workflows/continuous-integration.yaml | 136 +----------------- 1 file changed, 1 insertion(+), 135 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index f6764819a..5f98be5fb 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ linux ] - arch: [ x86_64, aarch64 ] + arch: [ x86_64 ] compiler: [ ghc94 ] devx-version: [ 54ea65610338600bd4c4afd04b0b6ff612988fd4 ] @@ -508,137 +508,3 @@ jobs: cache-from: type=registry,ref=${{ steps.base-variables.outputs.image }}:latest-${{ matrix.network }} cache-to: type=inline - docker_standalone: - needs: [ server_build ] - runs-on: ${{ matrix.os == 'linux' && 'ubuntu-22.04' }} - strategy: - matrix: - os: [ linux ] - target: [ ogmios ] - arch: [ x86_64, aarch64 ] - steps: - - name: 📥 Checkout repository - uses: actions/checkout@v3 - with: - submodules: true - - - name: 🧰 Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: 🧐 hadolint - uses: brpaz/hadolint-action@v1.5.0 - with: - dockerfile: "./Dockerfile" - failure-threshold: warning - ignore: DL3029 DL3059 - - - name: 🐳 Login to DockerHub - if: ${{ github.event_name == 'push' }} - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - - - name: 📝 Base Variables - id: base-variables - run: | - echo "image=cardanosolutions/${{ matrix.target }}" >> $GITHUB_OUTPUT - - - name: 📝 Tag Variables - if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') }} - id: tag-variables - run: | - echo "tag=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT - - - name: 📝 Docker metadata - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ steps.base-variables.outputs.image }} - tags: | - type=raw,value=latest,enable={{is_default_branch}} - type=semver,pattern=v{{version}} - - - name: 📥 Download - uses: actions/download-artifact@v3 - with: - name: ogmios-${{ github.sha }}-${{ matrix.arch }}-${{ matrix.os }} - path: server - - - name: 📸 Build image - id: build - if: ${{ github.event_name == 'push' }} - uses: docker/build-push-action@v4 - with: - context: . - target: ${{ matrix.target }} - platforms: ${{ matrix.os }}/${{ matrix.arch == 'x86_64' && 'amd64' || 'arm64' }} - cache-from: type=registry,ref=${{ steps.base-variables.outputs.image }}:latest - cache-to: type=inline - outputs: type=image,name=${{ steps.base-variables.outputs.image }},push-by-digest=true,name-canonical=true,push=true - - - name: 🔡 Export digest - if: ${{ github.event_name == 'push' }} - run: | - mkdir -p /tmp/digests - digest="${{ steps.build.outputs.digest }}" - touch "/tmp/digests/${digest#sha256:}" - - - name: 💾 Upload digest - if: ${{ github.event_name == 'push' }} - uses: actions/upload-artifact@v3 - with: - name: digests - path: /tmp/digests/* - if-no-files-found: error - retention-days: 1 - - registry: - needs: [ docker_standalone ] - runs-on: ubuntu-22.04 - strategy: - matrix: - target: [ ogmios ] - steps: - - name: 📥 Download digests - uses: actions/download-artifact@v3 - with: - name: digests - path: /tmp/digests - - - name: 🧰 Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: 📝 Base Variables - id: base-variables - run: | - echo "image=cardanosolutions/${{ matrix.target }}" >> $GITHUB_OUTPUT - - - name: 📝 Docker metadata - id: meta - uses: docker/metadata-action@v5 - with: - images: ${{ steps.base-variables.outputs.image }} - tags: | - type=raw,value=latest,enable={{is_default_branch}} - type=semver,pattern=v{{version}} - - - name: 🐳 Login to DockerHub - if: ${{ github.event_name == 'push' }} - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} - - - name: 📦 Create manifest list and push - if: ${{ github.event_name == 'push' }} - working-directory: /tmp/digests - run: | - docker buildx imagetools create \ - $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ steps.base-variables.outputs.image }}@sha256:%s ' *) - - - name: 🧐 Inspect image - if: ${{ github.event_name == 'push' }} - run: | - docker buildx imagetools inspect ${{ steps.base-variables.outputs.image }}:${{ steps.meta.outputs.version }} From e656b325f1aff4c2b52ce6b635bf2144ab02d680 Mon Sep 17 00:00:00 2001 From: Ritudhwaj Ambardekar Date: Tue, 10 Dec 2024 16:04:55 +0530 Subject: [PATCH 4/5] v10.1.3 --- .github/workflows/continuous-integration.yaml | 2 +- Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 5f98be5fb..4fee649fc 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -421,7 +421,7 @@ jobs: with: dockerfile: "./Dockerfile" failure-threshold: warning - ignore: DL3029 DL3059 + ignore: DL3029 DL3059 DL3006 - name: 🐳 Login to DockerHub if: ${{ github.event_name == 'push' }} diff --git a/Dockerfile b/Dockerfile index e886d415f..15471459f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -ARG CARDANO_NODE_IMAGE=ghcr.io/intersectmbo/cardano-node:9.1.1 +ARG CARDANO_NODE_IMAGE=ghcr.io/intersectmbo/cardano-node:10.1.3 # # # --------------------------- BUILD (ogmios) --------------------------------- # From 8f546aca5122993d064223107c48b0f946435a59 Mon Sep 17 00:00:00 2001 From: Damb <35940439+RitudhwajA@users.noreply.github.com> Date: Tue, 10 Dec 2024 16:48:47 +0530 Subject: [PATCH 5/5] Revert "V6.9.0 with v10.1.3" --- .github/workflows/continuous-integration.yaml | 148 +++++++++++++++++- CHANGELOG.md | 2 +- Dockerfile | 2 +- clients/TypeScript/package.json | 2 +- .../TypeScript/packages/client/package.json | 4 +- clients/TypeScript/packages/repl/package.json | 4 +- .../TypeScript/packages/schema/package.json | 2 +- server/ogmios.cabal | 2 +- server/package.yaml | 2 +- 9 files changed, 151 insertions(+), 17 deletions(-) diff --git a/.github/workflows/continuous-integration.yaml b/.github/workflows/continuous-integration.yaml index 4fee649fc..abd651883 100644 --- a/.github/workflows/continuous-integration.yaml +++ b/.github/workflows/continuous-integration.yaml @@ -23,7 +23,7 @@ jobs: strategy: matrix: os: [ linux ] - arch: [ x86_64 ] + arch: [ x86_64, aarch64 ] compiler: [ ghc94 ] devx-version: [ 54ea65610338600bd4c4afd04b0b6ff612988fd4 ] @@ -227,7 +227,7 @@ jobs: os: [ linux ] arch: [ x86_64 ] network: [ preview ] - cardano-node: [ 10.1.3 ] + cardano-node: [ 10.1.2 ] runs-on: ${{ matrix.os == 'linux' && 'ubuntu-22.04' }} steps: @@ -402,10 +402,10 @@ jobs: strategy: matrix: os: [ linux ] - target: [ ogmios ] + target: [ cardano-node-ogmios ] network: [ mainnet, preprod, preview, sanchonet ] - cardano-node: [ 10.1.3 ] - cardano-node-latest: [ 10.1.3 ] + cardano-node: [ 10.1.2 ] + cardano-node-latest: [ 10.1.2 ] arch: [ x86_64 ] steps: - name: 📥 Checkout repository @@ -421,7 +421,7 @@ jobs: with: dockerfile: "./Dockerfile" failure-threshold: warning - ignore: DL3029 DL3059 DL3006 + ignore: DL3029 DL3059 - name: 🐳 Login to DockerHub if: ${{ github.event_name == 'push' }} @@ -433,7 +433,7 @@ jobs: - name: 📝 Base Variables id: base-variables run: | - echo "image=ritudhwaj/${{ matrix.target }}" >> $GITHUB_OUTPUT + echo "image=cardanosolutions/${{ matrix.target }}" >> $GITHUB_OUTPUT - name: 📝 Tag Variables if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') }} @@ -508,3 +508,137 @@ jobs: cache-from: type=registry,ref=${{ steps.base-variables.outputs.image }}:latest-${{ matrix.network }} cache-to: type=inline + docker_standalone: + needs: [ server_build ] + runs-on: ${{ matrix.os == 'linux' && 'ubuntu-22.04' }} + strategy: + matrix: + os: [ linux ] + target: [ ogmios ] + arch: [ x86_64, aarch64 ] + steps: + - name: 📥 Checkout repository + uses: actions/checkout@v3 + with: + submodules: true + + - name: 🧰 Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: 🧐 hadolint + uses: brpaz/hadolint-action@v1.5.0 + with: + dockerfile: "./Dockerfile" + failure-threshold: warning + ignore: DL3029 DL3059 + + - name: 🐳 Login to DockerHub + if: ${{ github.event_name == 'push' }} + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + + - name: 📝 Base Variables + id: base-variables + run: | + echo "image=cardanosolutions/${{ matrix.target }}" >> $GITHUB_OUTPUT + + - name: 📝 Tag Variables + if: ${{ github.event_name == 'push' && startsWith(github.ref, 'refs/tags') }} + id: tag-variables + run: | + echo "tag=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT + + - name: 📝 Docker metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ steps.base-variables.outputs.image }} + tags: | + type=raw,value=latest,enable={{is_default_branch}} + type=semver,pattern=v{{version}} + + - name: 📥 Download + uses: actions/download-artifact@v3 + with: + name: ogmios-${{ github.sha }}-${{ matrix.arch }}-${{ matrix.os }} + path: server + + - name: 📸 Build image + id: build + if: ${{ github.event_name == 'push' }} + uses: docker/build-push-action@v4 + with: + context: . + target: ${{ matrix.target }} + platforms: ${{ matrix.os }}/${{ matrix.arch == 'x86_64' && 'amd64' || 'arm64' }} + cache-from: type=registry,ref=${{ steps.base-variables.outputs.image }}:latest + cache-to: type=inline + outputs: type=image,name=${{ steps.base-variables.outputs.image }},push-by-digest=true,name-canonical=true,push=true + + - name: 🔡 Export digest + if: ${{ github.event_name == 'push' }} + run: | + mkdir -p /tmp/digests + digest="${{ steps.build.outputs.digest }}" + touch "/tmp/digests/${digest#sha256:}" + + - name: 💾 Upload digest + if: ${{ github.event_name == 'push' }} + uses: actions/upload-artifact@v3 + with: + name: digests + path: /tmp/digests/* + if-no-files-found: error + retention-days: 1 + + registry: + needs: [ docker_standalone ] + runs-on: ubuntu-22.04 + strategy: + matrix: + target: [ ogmios ] + steps: + - name: 📥 Download digests + uses: actions/download-artifact@v3 + with: + name: digests + path: /tmp/digests + + - name: 🧰 Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: 📝 Base Variables + id: base-variables + run: | + echo "image=cardanosolutions/${{ matrix.target }}" >> $GITHUB_OUTPUT + + - name: 📝 Docker metadata + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ steps.base-variables.outputs.image }} + tags: | + type=raw,value=latest,enable={{is_default_branch}} + type=semver,pattern=v{{version}} + + - name: 🐳 Login to DockerHub + if: ${{ github.event_name == 'push' }} + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + + - name: 📦 Create manifest list and push + if: ${{ github.event_name == 'push' }} + working-directory: /tmp/digests + run: | + docker buildx imagetools create \ + $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf '${{ steps.base-variables.outputs.image }}@sha256:%s ' *) + + - name: 🧐 Inspect image + if: ${{ github.event_name == 'push' }} + run: | + docker buildx imagetools inspect ${{ steps.base-variables.outputs.image }}:${{ steps.meta.outputs.version }} diff --git a/CHANGELOG.md b/CHANGELOG.md index cbcd66d91..4715fb953 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,7 +7,7 @@ pre: "6. " math: true --- -### [6.9.0] - 2024-11-08 +### [6.9.0] - UNRELEASED #### Added diff --git a/Dockerfile b/Dockerfile index 15471459f..e886d415f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -ARG CARDANO_NODE_IMAGE=ghcr.io/intersectmbo/cardano-node:10.1.3 +ARG CARDANO_NODE_IMAGE=ghcr.io/intersectmbo/cardano-node:9.1.1 # # # --------------------------- BUILD (ogmios) --------------------------------- # diff --git a/clients/TypeScript/package.json b/clients/TypeScript/package.json index 8fe29246c..8d9a00506 100644 --- a/clients/TypeScript/package.json +++ b/clients/TypeScript/package.json @@ -1,6 +1,6 @@ { "name": "cardano-ogmios", - "version": "6.9.0", + "version": "6.8.0", "private": true, "description": "TypeScript monorepo with client libraries for Cardano Ogmios", "engines": { diff --git a/clients/TypeScript/packages/client/package.json b/clients/TypeScript/packages/client/package.json index c6b98f9eb..4b889d5d2 100644 --- a/clients/TypeScript/packages/client/package.json +++ b/clients/TypeScript/packages/client/package.json @@ -1,6 +1,6 @@ { "name": "@cardano-ogmios/client", - "version": "6.9.0", + "version": "6.8.0", "description": "TypeScript client library for Cardano Ogmios", "engines": { "node": ">=14" @@ -47,7 +47,7 @@ "typescript": "^4.2.3" }, "dependencies": { - "@cardano-ogmios/schema": "6.9.0", + "@cardano-ogmios/schema": "6.8.0", "@cardanosolutions/json-bigint": "^1.0.1", "@types/json-bigint": "^1.0.1", "bech32": "^2.0.0", diff --git a/clients/TypeScript/packages/repl/package.json b/clients/TypeScript/packages/repl/package.json index 81fb93275..c9897e76e 100644 --- a/clients/TypeScript/packages/repl/package.json +++ b/clients/TypeScript/packages/repl/package.json @@ -1,6 +1,6 @@ { "name": "@cardano-ogmios/repl", - "version": "6.9.0", + "version": "6.8.0", "description": "REPL for Cardano Ogmios", "engines": { "node": ">=14" @@ -39,7 +39,7 @@ "typescript": "^4.2.3" }, "dependencies": { - "@cardano-ogmios/client": "6.9.0", + "@cardano-ogmios/client": "6.8.0", "yargs-parser": "^20.2.7" }, "files": [ diff --git a/clients/TypeScript/packages/schema/package.json b/clients/TypeScript/packages/schema/package.json index a01d8170c..fd8c3edf1 100644 --- a/clients/TypeScript/packages/schema/package.json +++ b/clients/TypeScript/packages/schema/package.json @@ -1,6 +1,6 @@ { "name": "@cardano-ogmios/schema", - "version": "6.9.0", + "version": "6.8.0", "description": "Generated TypeScript from the Cardano Ogmios schema", "engines": { "node": ">=14" diff --git a/server/ogmios.cabal b/server/ogmios.cabal index 51d16dbf9..2d3e725b9 100644 --- a/server/ogmios.cabal +++ b/server/ogmios.cabal @@ -5,7 +5,7 @@ cabal-version: 3.0 -- see: https://github.com/sol/hpack name: ogmios -version: 6.9.0 +version: 0 synopsis: A JSON/RPC-2.0 WebSocket client for cardano-node description: Please see the README on GitHub at category: Web diff --git a/server/package.yaml b/server/package.yaml index ed5c84004..86f309442 100644 --- a/server/package.yaml +++ b/server/package.yaml @@ -1,7 +1,7 @@ _config: !include ".hpack.config.yaml" name: ogmios -version: 6.9.0 +version: 0 stability: stable github: "cardanosolutions/ogmios" license: MPL-2.0