From fa83434dacee5be5177275aa88b6e8fea402dd62 Mon Sep 17 00:00:00 2001 From: Frank Zhu Date: Wed, 21 Feb 2024 10:34:48 -0600 Subject: [PATCH 1/8] fix: cd-release gha --- median/package.json | 3 --- package.json | 2 +- pnpm-lock.yaml | 6 ++++++ 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/median/package.json b/median/package.json index 6b8d046..9e58af4 100644 --- a/median/package.json +++ b/median/package.json @@ -3,9 +3,6 @@ "version": "0.1.0", "description": "", "main": "index.js", - "dependencies": { - "libs": "workspace:*" - }, "author": "", "license": "UNLICENSED" } diff --git a/package.json b/package.json index e4e4577..9e9143f 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ }, "homepage": "https://github.com/smartcontractkit/chainlink-feeds#readme", "dependencies": { - "median": "workspace:*", + "median": "workspace:*" }, "devDependencies": { "@changesets/changelog-github": "^0.4.8", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fdb2171..14aa35e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -7,6 +7,10 @@ settings: importers: .: + dependencies: + median: + specifier: workspace:* + version: link:median devDependencies: '@changesets/changelog-github': specifier: ^0.4.8 @@ -18,6 +22,8 @@ importers: specifier: ^7.5.4 version: 7.5.4 + median: {} + packages: /@babel/code-frame@7.23.5: From 24206a912decb5b42fce5d0c8e2c99225da2503f Mon Sep 17 00:00:00 2001 From: Frank Zhu Date: Wed, 21 Feb 2024 10:48:47 -0600 Subject: [PATCH 2/8] update gati url secret --- .github/workflows/push-tag-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-tag-release.yml b/.github/workflows/push-tag-release.yml index 50e7260..0d82ee2 100644 --- a/.github/workflows/push-tag-release.yml +++ b/.github/workflows/push-tag-release.yml @@ -83,7 +83,7 @@ jobs: # gati inputs use-gati: "true" aws-role-arn-gati: ${{ secrets.AWS_OIDC_CHAINLINK_FEEDS_CI_CHANGESET_TOKEN_ISSUER_ROLE_ARN }} - aws-lambda-url-gati: ${{ secrets.AWS_LAMBDA_URL_GATI }} + aws-lambda-url-gati: ${{ secrets.AWS_FOUNDATIONS_GATI_URL }} # golang inputs go-version-file: go.work # goreleaser inputs From 6544ed0e779a2656f691d904fd886ac7a97ee83f Mon Sep 17 00:00:00 2001 From: Frank Zhu Date: Wed, 21 Feb 2024 10:54:45 -0600 Subject: [PATCH 3/8] update go-version-file --- .github/workflows/push-tag-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/push-tag-release.yml b/.github/workflows/push-tag-release.yml index 0d82ee2..ae47f01 100644 --- a/.github/workflows/push-tag-release.yml +++ b/.github/workflows/push-tag-release.yml @@ -85,7 +85,7 @@ jobs: aws-role-arn-gati: ${{ secrets.AWS_OIDC_CHAINLINK_FEEDS_CI_CHANGESET_TOKEN_ISSUER_ROLE_ARN }} aws-lambda-url-gati: ${{ secrets.AWS_FOUNDATIONS_GATI_URL }} # golang inputs - go-version-file: go.work + go-version-file: go.mod # goreleaser inputs goreleaser-args: "--config ./${{ needs.check-tags.outputs.tag-name }}/.goreleaser.ci.yaml" goreleaser-dist: goreleaser-pro From 097457dbb53cb53fd55f8127bd2bfbaafa3a4eea Mon Sep 17 00:00:00 2001 From: Frank Zhu Date: Wed, 21 Feb 2024 11:17:00 -0600 Subject: [PATCH 4/8] update goreleaser config --- .goreleaser.ci.yaml => median/.goreleaser.ci.yaml | 4 ++-- .goreleaser.yaml => median/.goreleaser.yaml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) rename .goreleaser.ci.yaml => median/.goreleaser.ci.yaml (82%) rename .goreleaser.yaml => median/.goreleaser.yaml (55%) diff --git a/.goreleaser.ci.yaml b/median/.goreleaser.ci.yaml similarity index 82% rename from .goreleaser.ci.yaml rename to median/.goreleaser.ci.yaml index a4d103b..24ad120 100644 --- a/.goreleaser.ci.yaml +++ b/median/.goreleaser.ci.yaml @@ -6,7 +6,7 @@ includes: nightly: # This is a GoReleaser Pro feature that we use for pre-releases. # Default is `{{ incpatch .Version }}-{{ .ShortCommit }}-nightly`. - name_template: '{{ incpatch .Version }}-{{ .ShortCommit }}-devel' + name_template: "{{ incpatch .Version }}-{{ .ShortCommit }}-devel" # Tag name to create if publish_release is enabled. tag_name: devel @@ -16,4 +16,4 @@ nightly: # Whether to delete previous pre-releases for the same `tag_name` when # releasing. - keep_single_release: false \ No newline at end of file + keep_single_release: false diff --git a/.goreleaser.yaml b/median/.goreleaser.yaml similarity index 55% rename from .goreleaser.yaml rename to median/.goreleaser.yaml index a0ff2ef..25f8611 100644 --- a/.goreleaser.yaml +++ b/median/.goreleaser.yaml @@ -3,8 +3,8 @@ includes: - from_file: path: ./.goreleaser-template.yaml -project_name: chainlink-feeds +project_name: median monorepo: - tag_prefix: chainlink-feeds@ - dir: chainlink-feeds \ No newline at end of file + tag_prefix: median@ + dir: median From 2373a41ee17b72e36da7830706ce1376d1cc7eeb Mon Sep 17 00:00:00 2001 From: Frank Zhu Date: Wed, 21 Feb 2024 11:26:44 -0600 Subject: [PATCH 5/8] update goreleaser config --- median/.goreleaser.ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/median/.goreleaser.ci.yaml b/median/.goreleaser.ci.yaml index 24ad120..4b559a1 100644 --- a/median/.goreleaser.ci.yaml +++ b/median/.goreleaser.ci.yaml @@ -1,7 +1,7 @@ # Requires GoReleaser Pro includes: - from_file: - path: ./.goreleaser.yaml + path: ./median/.goreleaser.yaml nightly: # This is a GoReleaser Pro feature that we use for pre-releases. From 60f8f4aca43e64c3b137934e921fea255050b29c Mon Sep 17 00:00:00 2001 From: Frank Zhu Date: Wed, 21 Feb 2024 11:30:20 -0600 Subject: [PATCH 6/8] update goreleaser config --- .goreleaser-template.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.goreleaser-template.yaml b/.goreleaser-template.yaml index cf74f03..89d3867 100644 --- a/.goreleaser-template.yaml +++ b/.goreleaser-template.yaml @@ -7,7 +7,7 @@ env: builds: - binary: "{{ .ProjectName }}" id: linux-amd64 - main: ./cmd + main: ./cmd/chainlink-feeds env: - CGO_ENABLED=1 - CC=$ZIG_EXEC cc -target x86_64-linux-gnu @@ -21,7 +21,7 @@ builds: - amd64 - binary: "{{ .ProjectName }}" id: linux-arm64 - main: ./cmd + main: ./cmd/chainlink-feeds env: - CGO_ENABLED=1 - CC=$ZIG_EXEC cc -target aarch64-linux-gnu @@ -101,4 +101,4 @@ release: # the GitHub Release will be created as a "prerelease". # Default is false. prerelease: auto - disable: true \ No newline at end of file + disable: true From 7259b55269e05564d630f1f0e529cdc6f99c86a2 Mon Sep 17 00:00:00 2001 From: Frank Zhu Date: Wed, 21 Feb 2024 11:32:33 -0600 Subject: [PATCH 7/8] update goreleaser config --- .goreleaser-template.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.goreleaser-template.yaml b/.goreleaser-template.yaml index 89d3867..8fc4499 100644 --- a/.goreleaser-template.yaml +++ b/.goreleaser-template.yaml @@ -7,7 +7,7 @@ env: builds: - binary: "{{ .ProjectName }}" id: linux-amd64 - main: ./cmd/chainlink-feeds + main: ../cmd/chainlink-feeds env: - CGO_ENABLED=1 - CC=$ZIG_EXEC cc -target x86_64-linux-gnu @@ -21,7 +21,7 @@ builds: - amd64 - binary: "{{ .ProjectName }}" id: linux-arm64 - main: ./cmd/chainlink-feeds + main: ../cmd/chainlink-feeds env: - CGO_ENABLED=1 - CC=$ZIG_EXEC cc -target aarch64-linux-gnu From d31c649aab9eae476e26026154a1cdf18d954018 Mon Sep 17 00:00:00 2001 From: Frank Zhu Date: Wed, 21 Feb 2024 11:52:30 -0600 Subject: [PATCH 8/8] update go-plugins commit in go.mod --- go.mod | 6 +++--- go.sum | 10 ++++------ 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index 38498dc..3e4b691 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/smartcontractkit/chainlink-feeds go 1.21.3 require ( - github.com/hashicorp/go-plugin v1.5.2 + github.com/hashicorp/go-plugin v1.6.0 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240119014733-5ea50bbe81be github.com/smartcontractkit/libocr v0.0.0-20231020123319-d255366a6545 github.com/stretchr/testify v1.8.4 @@ -26,7 +26,7 @@ require ( github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.0.0-rc.3 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/hashicorp/go-hclog v1.5.0 // indirect - github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb // indirect + github.com/hashicorp/yamux v0.1.1 // indirect github.com/jpillora/backoff v1.0.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.16 // indirect @@ -67,7 +67,7 @@ require ( replace ( // until merged upstream: https://github.com/hashicorp/go-plugin/pull/257 - github.com/hashicorp/go-plugin => github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 + github.com/hashicorp/go-plugin => github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16 // until merged upstream: https://github.com/mwitkow/grpc-proxy/pull/69 github.com/mwitkow/grpc-proxy => github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f diff --git a/go.sum b/go.sum index bed5d10..07d2480 100644 --- a/go.sum +++ b/go.sum @@ -148,8 +148,8 @@ github.com/hashicorp/go-hclog v1.5.0 h1:bI2ocEMgcVlz55Oj1xZNBsVi900c7II+fWDyV9o+ github.com/hashicorp/go-hclog v1.5.0/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= -github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb h1:b5rjCoWHc7eqmAS4/qyk21ZsHyb6Mxv/jykxvNTkU4M= -github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM= +github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= +github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= @@ -202,12 +202,10 @@ github.com/prometheus/procfs v0.11.1/go.mod h1:eesXgaPo1q7lBpVMoMy0ZOFTth9hBn4W/ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240118144452-7fcb73fb88c8 h1:6pL+DzkEGLT4NTd1SoGk1vL0/cbkDuvBsV0DRUb4lrc= -github.com/smartcontractkit/chainlink-common v0.1.7-0.20240118144452-7fcb73fb88c8/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= github.com/smartcontractkit/chainlink-common v0.1.7-0.20240119014733-5ea50bbe81be h1:ahwXHg5kImjhq85kWRxylXJBqClZpdrBvip9ApQJTP8= github.com/smartcontractkit/chainlink-common v0.1.7-0.20240119014733-5ea50bbe81be/go.mod h1:f+0ei9N4PlTJHu7pbGzEjTnBUr45syPdGFu5+31lS5Q= -github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= -github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306/go.mod h1:w1sAEES3g3PuV/RzUrgow20W2uErMly84hhD3um1WL4= +github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16 h1:TFe+FvzxClblt6qRfqEhUfa4kFQx5UobuoFGO2W4mMo= +github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16/go.mod h1:lBS5MtSSBZk0SHc66KACcjjlU6WzEVP/8pwz68aMkCI= github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f h1:hgJif132UCdjo8u43i7iPN1/MFnu49hv7lFGFftCHKU= github.com/smartcontractkit/grpc-proxy v0.0.0-20230731113816-f1be6620749f/go.mod h1:MvMXoufZAtqExNexqi4cjrNYE9MefKddKylxjS+//n0= github.com/smartcontractkit/libocr v0.0.0-20231020123319-d255366a6545 h1:qOsw2ETQD/Sb/W2xuYn2KPWjvvsWA0C+l19rWFq8iNg=