Merge pull request #2 from GincoInc/revert-1-v6.9.0-with-v10.1.3

Revert "V6.9.0 with v10.1.3"
GincoInc · Dec 10, 2024 · c99a5f2 · c99a5f2
2 parents fc03735 + 8f546ac
commit c99a5f2
Show file tree

Hide file tree

Showing 9 changed files with 151 additions and 17 deletions.
diff --git 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/[email protected]
+      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
@@ -7,7 +7,7 @@ pre: "<b>6. </b>"
 math: true
 ---
 
-### [6.9.0] - 2024-11-08
+### [6.9.0] - UNRELEASED
 
 #### Added
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git 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