From b28d4f27b2500b3887fdbcf0c4a05af923dd9f87 Mon Sep 17 00:00:00 2001 From: Arief Rahmansyah Date: Fri, 17 May 2024 09:18:25 +0700 Subject: [PATCH 1/8] Update github actions and node version --- .github/workflows/codesee-arch-diagram.yml | 23 -------- .github/workflows/external.yml | 18 +++--- .github/workflows/merlin.yml | 66 +++++++++++----------- .github/workflows/release.yml | 20 +++---- Makefile | 2 +- api/cmd/api/main.go | 6 +- 6 files changed, 57 insertions(+), 78 deletions(-) delete mode 100644 .github/workflows/codesee-arch-diagram.yml diff --git a/.github/workflows/codesee-arch-diagram.yml b/.github/workflows/codesee-arch-diagram.yml deleted file mode 100644 index 806d41d12..000000000 --- a/.github/workflows/codesee-arch-diagram.yml +++ /dev/null @@ -1,23 +0,0 @@ -# This workflow was added by CodeSee. Learn more at https://codesee.io/ -# This is v2.0 of this workflow file -on: - push: - branches: - - main - pull_request_target: - types: [opened, synchronize, reopened] - -name: CodeSee - -permissions: read-all - -jobs: - codesee: - runs-on: ubuntu-latest - continue-on-error: true - name: Analyze the repo with CodeSee - steps: - - uses: Codesee-io/codesee-action@v2 - with: - codesee-token: ${{ secrets.CODESEE_ARCH_DIAG_API_TOKEN }} - codesee-url: https://app.codesee.io diff --git a/.github/workflows/external.yml b/.github/workflows/external.yml index dcf3f2a57..af6065902 100644 --- a/.github/workflows/external.yml +++ b/.github/workflows/external.yml @@ -12,14 +12,16 @@ jobs: packages: write steps: - uses: actions/checkout@v4 - - name: Build and push MLflow Docker image - uses: docker/build-push-action@v1 + - name: Log in to the Container registry + uses: docker/login-action@v3 with: + registry: ${{ env.DOCKER_REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - registry: ghcr.io - repository: caraml-dev/mlflow - path: mlflow - dockerfile: mlflow/Dockerfile - build_args: MLFLOW_VERSION=1.3.0 - tags: 1.3.0 + - name: Build and push MLflow Docker image + uses: docker/build-push-action@v5 + with: + context: mlflow + file: Dockerfile + build-args: MLFLOW_VERSION=1.3.0 + tags: ghcr.io/caraml-dev/mlflow:1.3.0 diff --git a/.github/workflows/merlin.yml b/.github/workflows/merlin.yml index e943bceeb..bb9be00ea 100644 --- a/.github/workflows/merlin.yml +++ b/.github/workflows/merlin.yml @@ -51,13 +51,13 @@ jobs: - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip-${{ matrix.python-version }}- - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.local/share/virtualenvs key: ${{ runner.os }}-python-${{ matrix.python-version }}-pipenv-batch-predictor @@ -83,13 +83,13 @@ jobs: - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip-${{ matrix.python-version }}- - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.local/share/virtualenvs key: ${{ runner.os }}-python-${{ matrix.python-version }}-pipenv-pyfunc-server @@ -115,13 +115,13 @@ jobs: - uses: actions/setup-python@v5 with: python-version: ${{ matrix.python-version }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ matrix.python-version }}-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip-${{ matrix.python-version }}- - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.local/share/virtualenvs key: ${{ runner.os }}-python-${{ matrix.python-version }}-pipenv-python-sdk @@ -145,15 +145,15 @@ jobs: lint-api: runs-on: ubuntu-latest steps: - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: golangci-lint - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v6 with: # Ensure the same version as the one defined in Makefile - version: v1.56.2 + version: v1.58.1 working-directory: api test-api: @@ -169,10 +169,10 @@ jobs: - 5432:5432 steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.cache/go-build @@ -206,7 +206,7 @@ jobs: id: setup-python with: python-version: "3.10" - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/requirements.txt') }} @@ -225,14 +225,14 @@ jobs: steps: - name: Checkout to the target branch uses: actions/checkout@v4 - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: - node-version: 16 + node-version: 20 - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" - name: Cache YARN - uses: actions/cache@v3 + uses: actions/cache@v4 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) with: path: ${{ steps.yarn-cache-dir-path.outputs.dir }} @@ -240,7 +240,7 @@ jobs: restore-keys: | ${{ runner.os }}-yarn- - name: Cache Node Modules - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ui/node_modules key: | @@ -255,7 +255,7 @@ jobs: - name: Build UI static files run: make build-ui - name: Publish UI Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: merlin-ui-dist path: ui/build/ @@ -279,7 +279,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Download UI Dist - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: merlin-ui-dist path: ui/build @@ -288,7 +288,7 @@ jobs: - name: Save API Docker run: docker image save --output merlin.${{ needs.create-version.outputs.version }}.tar merlin:${{ needs.create-version.outputs.version }} - name: Publish API Docker Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: merlin.${{ needs.create-version.outputs.version }}.tar path: merlin.${{ needs.create-version.outputs.version }}.tar @@ -316,7 +316,7 @@ jobs: - name: Save Batch Predictor Base Docker run: docker image save --output merlin-pyspark-base.${{ needs.create-version.outputs.version }}.tar ${{ env.DOCKER_IMAGE_TAG }} - name: Publish Batch Predictor Base Docker Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: merlin-pyspark-base.${{ needs.create-version.outputs.version }}.tar path: merlin-pyspark-base.${{ needs.create-version.outputs.version }}.tar @@ -345,7 +345,7 @@ jobs: - name: Save Pyfunc Server Base Docker run: docker image save --output merlin-pyfunc-base.${{ needs.create-version.outputs.version }}.tar ${{ env.DOCKER_IMAGE_TAG }} - name: Publish Pyfunc Server Base Docker Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: merlin-pyfunc-base.${{ needs.create-version.outputs.version }}.tar path: merlin-pyfunc-base.${{ needs.create-version.outputs.version }}.tar @@ -357,10 +357,10 @@ jobs: - create-version steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: | ~/.cache/go-build @@ -377,7 +377,7 @@ jobs: - name: Save Standard Transformer Docker run: docker image save --output merlin-transformer.${{ needs.create-version.outputs.version }}.tar merlin-transformer:${{ needs.create-version.outputs.version }} - name: Publish Standard Transformer Docker Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: merlin-transformer.${{ needs.create-version.outputs.version }}.tar path: merlin-transformer.${{ needs.create-version.outputs.version }}.tar @@ -388,8 +388,8 @@ jobs: needs: - create-version steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v4 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} - name: Build Inference Logger @@ -399,7 +399,7 @@ jobs: - name: Save Inference Logger Docker run: docker image save --output merlin-logger.${{ needs.create-version.outputs.version }}.tar merlin-logger:${{ needs.create-version.outputs.version }} - name: Publish Inference Logger Docker Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: merlin-logger.${{ needs.create-version.outputs.version }}.tar path: merlin-logger.${{ needs.create-version.outputs.version }}.tar @@ -423,7 +423,7 @@ jobs: - name: Save Observation Publisher Docker run: docker image save --output merlin-observation-publisher.${{ needs.create-version.outputs.version }}.tar ${{ env.DOCKER_IMAGE_TAG }} - name: Publish Observation Publisher Docker Artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 with: name: merlin-observation-publisher.${{ needs.create-version.outputs.version }}.tar path: merlin-observation-publisher.${{ needs.create-version.outputs.version }}.tar @@ -450,13 +450,13 @@ jobs: - uses: actions/setup-python@v5 with: python-version: ${{ env.E2E_PYTHON_VERSION }} - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.cache/pip key: ${{ runner.os }}-pip-3.10-${{ hashFiles('**/requirements.txt') }} restore-keys: | ${{ runner.os }}-pip-3.10- - - uses: actions/cache@v3 + - uses: actions/cache@v4 with: path: ~/.local/share/virtualenvs key: ${{ runner.os }}-python-3.10-pipenv-python-sdk @@ -476,11 +476,11 @@ jobs: working-directory: merlin/scripts/e2e run: ./setup-cluster.sh merlin-cluster - name: Download API Docker Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: merlin.${{ needs.create-version.outputs.version }}.tar - name: Download Standard Transformer Docker Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: merlin-transformer.${{ needs.create-version.outputs.version }}.tar - name: Publish images to k3d registry diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6b1ae2397..7241e8d86 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -101,7 +101,7 @@ jobs: steps: - uses: actions/checkout@v4 - name: Log in to the Container registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ${{ env.DOCKER_REGISTRY }} username: ${{ github.actor }} @@ -121,7 +121,7 @@ jobs: packages: write steps: - name: Download API Docker Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: merlin.${{ inputs.version }}.tar - name: Retag and Push Docker Image @@ -138,7 +138,7 @@ jobs: packages: write steps: - name: Download API Docker Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: merlin-transformer.${{ inputs.version }}.tar - name: Retag and Push Docker Image @@ -155,7 +155,7 @@ jobs: packages: write steps: - name: Download API Docker Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: merlin-logger.${{ inputs.version }}.tar - name: Retag and Push Docker Image @@ -172,13 +172,13 @@ jobs: DOCKER_IMAGE_TAG: "ghcr.io/${{ github.repository }}/merlin-pyspark-base:${{ inputs.version }}" steps: - name: Log in to the Container registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ${{ env.DOCKER_REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Download Batch Predictor Base Docker Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: merlin-pyspark-base.${{ inputs.version }}.tar - name: Retag and Push Docker Image @@ -192,13 +192,13 @@ jobs: DOCKER_IMAGE_TAG: "ghcr.io/${{ github.repository }}/merlin-pyfunc-base:${{ inputs.version }}" steps: - name: Log in to the Container registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ${{ env.DOCKER_REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Download Pyfunc Server Base Docker Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: merlin-pyfunc-base.${{ inputs.version }}.tar - name: Retag and Push Docker Image @@ -212,13 +212,13 @@ jobs: DOCKER_IMAGE_TAG: "ghcr.io/${{ github.repository }}/merlin-observation-publisher:${{ inputs.version }}" steps: - name: Log in to the Container registry - uses: docker/login-action@v1 + uses: docker/login-action@v3 with: registry: ${{ env.DOCKER_REGISTRY }} username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Download Observation Publisher Docker Artifact - uses: actions/download-artifact@v2 + uses: actions/download-artifact@v4 with: name: merlin-observation-publisher.${{ inputs.version }}.tar - name: Retag and Push Docker Image diff --git a/Makefile b/Makefile index fa8931519..f94283699 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ VERSION := $(or ${VERSION}, $(shell git describe --tags --always --first-parent) LOG_URL?=localhost:8002 TEST_TAGS?= -GOLANGCI_LINT_VERSION="v1.56.2" +GOLANGCI_LINT_VERSION="v1.58.1" PROTOC_GEN_GO_JSON_VERSION="v1.1.0" PROTOC_GEN_GO_VERSION="v1.26" PYTHON_VERSION ?= "39" #set as 38 39 310 for 3.8-3.10 respectively diff --git a/api/cmd/api/main.go b/api/cmd/api/main.go index 35411300f..ce0d7030c 100644 --- a/api/cmd/api/main.go +++ b/api/cmd/api/main.go @@ -141,9 +141,9 @@ func main() { registerQueueJob(dispatcher, dependencies.modelDeployment, dependencies.batchDeployment, dependencies.observabilityDeployment) dispatcher.Start() - if err := initCronJob(dependencies, db); err != nil { - log.Panicf("Failed to initialize cron jobs: %s", err) - } + // if err := initCronJob(dependencies, db); err != nil { + // log.Panicf("Failed to initialize cron jobs: %s", err) + // } router := mux.NewRouter() From 1a7b3435468e164b88bd9acddecd986b4780ede8 Mon Sep 17 00:00:00 2001 From: Arief Rahmansyah Date: Fri, 17 May 2024 10:29:13 +0700 Subject: [PATCH 2/8] Fix errors: fix lint-api; use node 18; fix miss DOCKER_REGISTRY env --- .github/workflows/external.yml | 3 +++ .github/workflows/merlin.yml | 2 +- api/cmd/api/main.go | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/external.yml b/.github/workflows/external.yml index af6065902..95bcb454e 100644 --- a/.github/workflows/external.yml +++ b/.github/workflows/external.yml @@ -5,6 +5,9 @@ on: - main pull_request: +env: + DOCKER_REGISTRY: ghcr.io + jobs: publish-mlflow-docker: runs-on: ubuntu-latest diff --git a/.github/workflows/merlin.yml b/.github/workflows/merlin.yml index bb9be00ea..7086e2fb2 100644 --- a/.github/workflows/merlin.yml +++ b/.github/workflows/merlin.yml @@ -227,7 +227,7 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 18 - name: Get yarn cache directory path id: yarn-cache-dir-path run: echo "::set-output name=dir::$(yarn cache dir)" diff --git a/api/cmd/api/main.go b/api/cmd/api/main.go index ce0d7030c..35411300f 100644 --- a/api/cmd/api/main.go +++ b/api/cmd/api/main.go @@ -141,9 +141,9 @@ func main() { registerQueueJob(dispatcher, dependencies.modelDeployment, dependencies.batchDeployment, dependencies.observabilityDeployment) dispatcher.Start() - // if err := initCronJob(dependencies, db); err != nil { - // log.Panicf("Failed to initialize cron jobs: %s", err) - // } + if err := initCronJob(dependencies, db); err != nil { + log.Panicf("Failed to initialize cron jobs: %s", err) + } router := mux.NewRouter() From 454827e53cc68836d53254917008590a39f778e4 Mon Sep 17 00:00:00 2001 From: Arief Rahmansyah Date: Fri, 17 May 2024 10:57:50 +0700 Subject: [PATCH 3/8] fix dockerfile for mlflow build --- .github/workflows/external.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/external.yml b/.github/workflows/external.yml index 95bcb454e..9827e1b45 100644 --- a/.github/workflows/external.yml +++ b/.github/workflows/external.yml @@ -25,6 +25,6 @@ jobs: uses: docker/build-push-action@v5 with: context: mlflow - file: Dockerfile + file: mlflow/Dockerfile build-args: MLFLOW_VERSION=1.3.0 tags: ghcr.io/caraml-dev/mlflow:1.3.0 From 08c5cf46b2c8fe672e788ae2143821d0e2329d85 Mon Sep 17 00:00:00 2001 From: Arief Rahmansyah Date: Fri, 17 May 2024 12:38:51 +0700 Subject: [PATCH 4/8] fix annotations warnings --- .github/workflows/merlin.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merlin.yml b/.github/workflows/merlin.yml index 7086e2fb2..b9ccc8e70 100644 --- a/.github/workflows/merlin.yml +++ b/.github/workflows/merlin.yml @@ -35,8 +35,8 @@ jobs: # If it's pull request the version string is prefixed by 0.0.0- [ ${{ github.event_name}} == "pull_request" ] && VERSION="0.0.0-${{ github.event.pull_request.head.sha }}" - echo ${VERSION} - echo "::set-output name=version::${VERSION}" + echo "${VERSION}" + echo "version=${VERSION}" >> "$GITHUB_OUTPUT" test-batch-predictor: runs-on: ubuntu-latest @@ -148,6 +148,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} + cache-dependency-path: api/go.sum - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v6 @@ -172,6 +173,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} + cache-dependency-path: api/go.sum - uses: actions/cache@v4 with: path: | @@ -228,9 +230,10 @@ jobs: - uses: actions/setup-node@v4 with: node-version: 18 + cache: "yarn" - name: Get yarn cache directory path id: yarn-cache-dir-path - run: echo "::set-output name=dir::$(yarn cache dir)" + run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT" - name: Cache YARN uses: actions/cache@v4 id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) @@ -360,6 +363,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} + cache-dependency-path: api/go.sum - uses: actions/cache@v4 with: path: | @@ -392,6 +396,7 @@ jobs: - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} + cache-dependency-path: api/go.sum - name: Build Inference Logger run: make build-inference-logger - name: Build Inference Logger Docker From d9a69871ee7a1e5b8231ccba2c7040cbf1913bb3 Mon Sep 17 00:00:00 2001 From: Arief Rahmansyah Date: Fri, 17 May 2024 12:41:21 +0700 Subject: [PATCH 5/8] Update build ui --- .github/workflows/merlin.yml | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/.github/workflows/merlin.yml b/.github/workflows/merlin.yml index b9ccc8e70..60d400366 100644 --- a/.github/workflows/merlin.yml +++ b/.github/workflows/merlin.yml @@ -231,24 +231,7 @@ jobs: with: node-version: 18 cache: "yarn" - - name: Get yarn cache directory path - id: yarn-cache-dir-path - run: echo "dir=$(yarn cache dir)" >> "$GITHUB_OUTPUT" - - name: Cache YARN - uses: actions/cache@v4 - id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`) - with: - path: ${{ steps.yarn-cache-dir-path.outputs.dir }} - key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }} - restore-keys: | - ${{ runner.os }}-yarn- - - name: Cache Node Modules - uses: actions/cache@v4 - with: - path: ui/node_modules - key: | - ${{ runner.os }}-modules-${{ hashFiles('ui/yarn.lock') }} - restore-keys: ${{ runner.os }}-modules- + cache-dependency-path: ui/yarn.lock - name: Install dependencies run: make init-dep-ui - name: Lint UI files From f96f6deb71779db989c67f51c878a935cfcea8c2 Mon Sep 17 00:00:00 2001 From: Arief Rahmansyah Date: Fri, 17 May 2024 14:21:24 +0700 Subject: [PATCH 6/8] Use node 16 --- .github/workflows/merlin.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/merlin.yml b/.github/workflows/merlin.yml index 60d400366..27d4e7c48 100644 --- a/.github/workflows/merlin.yml +++ b/.github/workflows/merlin.yml @@ -229,8 +229,8 @@ jobs: uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: - node-version: 18 - cache: "yarn" + node-version: 16 + cache: yarn cache-dependency-path: ui/yarn.lock - name: Install dependencies run: make init-dep-ui From b13ab2f8e45841d3847dbaefc25f94e1d4cd540b Mon Sep 17 00:00:00 2001 From: Arief Rahmansyah Date: Fri, 17 May 2024 15:01:04 +0700 Subject: [PATCH 7/8] Move checkout step to the beginning --- .github/workflows/merlin.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/merlin.yml b/.github/workflows/merlin.yml index 27d4e7c48..b805da31f 100644 --- a/.github/workflows/merlin.yml +++ b/.github/workflows/merlin.yml @@ -145,11 +145,11 @@ jobs: lint-api: runs-on: ubuntu-latest steps: + - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: go-version: ${{ env.GO_VERSION }} cache-dependency-path: api/go.sum - - uses: actions/checkout@v4 - name: golangci-lint uses: golangci/golangci-lint-action@v6 with: @@ -225,8 +225,7 @@ jobs: build-ui: runs-on: ubuntu-latest steps: - - name: Checkout to the target branch - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - uses: actions/setup-node@v4 with: node-version: 16 From 8c86118593f0feef92a749f7d3733da74a8ee94f Mon Sep 17 00:00:00 2001 From: Arief Rahmansyah Date: Fri, 17 May 2024 15:30:38 +0700 Subject: [PATCH 8/8] Use actions/setup-go@v5 built-in caching --- .github/workflows/merlin.yml | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/.github/workflows/merlin.yml b/.github/workflows/merlin.yml index b805da31f..07ee66934 100644 --- a/.github/workflows/merlin.yml +++ b/.github/workflows/merlin.yml @@ -174,14 +174,6 @@ jobs: with: go-version: ${{ env.GO_VERSION }} cache-dependency-path: api/go.sum - - uses: actions/cache@v4 - with: - path: | - ~/.cache/go-build - ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - name: Install dependencies run: | make setup @@ -346,14 +338,6 @@ jobs: with: go-version: ${{ env.GO_VERSION }} cache-dependency-path: api/go.sum - - uses: actions/cache@v4 - with: - path: | - ~/.cache/go-build - ~/go/pkg/mod - key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }} - restore-keys: | - ${{ runner.os }}-go- - name: Install dependencies run: make init-dep-api - name: Build Standard Transformer