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

V6.9.0 with v10.1.3 #1

Merged
merged 4 commits into from
Dec 10, 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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 7 additions & 141 deletions .github/workflows/continuous-integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
strategy:
matrix:
os: [ linux ]
arch: [ x86_64, aarch64 ]
arch: [ x86_64 ]
compiler: [ ghc94 ]
devx-version: [ 54ea65610338600bd4c4afd04b0b6ff612988fd4 ]

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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' }}
Expand All @@ -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') }}
Expand Down Expand Up @@ -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/[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 }}
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ pre: "<b>6. </b>"
math: true
---

### [6.9.0] - UNRELEASED
### [6.9.0] - 2024-11-08

#### Added

Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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) --------------------------------- #
Expand Down
2 changes: 1 addition & 1 deletion clients/TypeScript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cardano-ogmios",
"version": "6.8.0",
"version": "6.9.0",
"private": true,
"description": "TypeScript monorepo with client libraries for Cardano Ogmios",
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions clients/TypeScript/packages/client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-ogmios/client",
"version": "6.8.0",
"version": "6.9.0",
"description": "TypeScript client library for Cardano Ogmios",
"engines": {
"node": ">=14"
Expand Down Expand Up @@ -47,7 +47,7 @@
"typescript": "^4.2.3"
},
"dependencies": {
"@cardano-ogmios/schema": "6.8.0",
"@cardano-ogmios/schema": "6.9.0",
"@cardanosolutions/json-bigint": "^1.0.1",
"@types/json-bigint": "^1.0.1",
"bech32": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions clients/TypeScript/packages/repl/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-ogmios/repl",
"version": "6.8.0",
"version": "6.9.0",
"description": "REPL for Cardano Ogmios",
"engines": {
"node": ">=14"
Expand Down Expand Up @@ -39,7 +39,7 @@
"typescript": "^4.2.3"
},
"dependencies": {
"@cardano-ogmios/client": "6.8.0",
"@cardano-ogmios/client": "6.9.0",
"yargs-parser": "^20.2.7"
},
"files": [
Expand Down
2 changes: 1 addition & 1 deletion clients/TypeScript/packages/schema/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@cardano-ogmios/schema",
"version": "6.8.0",
"version": "6.9.0",
"description": "Generated TypeScript from the Cardano Ogmios schema",
"engines": {
"node": ">=14"
Expand Down
2 changes: 1 addition & 1 deletion server/ogmios.cabal

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/package.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
_config: !include ".hpack.config.yaml"

name: ogmios
version: 0
version: 6.9.0
stability: stable
github: "cardanosolutions/ogmios"
license: MPL-2.0
Expand Down
Loading