diff --git a/.github/actions/e2e/action.yaml b/.github/actions/e2e/action.yaml index ce00cf9d..940f9ea0 100644 --- a/.github/actions/e2e/action.yaml +++ b/.github/actions/e2e/action.yaml @@ -27,16 +27,9 @@ inputs: runs: using: "composite" steps: - - uses: actions/checkout@v3 - - name: Setup Go environment - if: ${{ inputs.client_type == 'go' }} - uses: ./.github/actions/setup-go - - name: Setup Node environment - if: ${{ inputs.client_type == 'node' }} - uses: ./.github/actions/setup-node - - name: Setup Node environment - if: ${{ inputs.client_type == 'java' }} - uses: ./.github/actions/setup-java + - uses: ./.github/actions/setup-language + with: + client_type: ${{ inputs.client_type }} - uses: rinx/setup-k3d@v0.0.4 with: version: latest @@ -88,11 +81,6 @@ runs: make ci/test # NOTE: we may change to 'ci/test/start' kill $pid - # NOTE: debug step - - name: Debug git changes - shell: bash - run: | - git diff - name: Delete downloaded dataset shell: bash run: | diff --git a/.github/actions/setup-language/action.yaml b/.github/actions/setup-language/action.yaml new file mode 100644 index 00000000..fa4f1ece --- /dev/null +++ b/.github/actions/setup-language/action.yaml @@ -0,0 +1,39 @@ +# +# Copyright (C) 2019-2024 vdaas.org vald team +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# You may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +name: "Setup language environment" +description: "A action to set up language environment" +inputs: + version: + description: "The version to use." + required: false + default: "" + client_type: + description: "Set client type. e.g) go, python, node, java" + required: true +runs: + using: "composite" + steps: + - name: Setup Go environment + if: ${{ inputs.client_type == 'go' }} + uses: ./.github/actions/setup-go + - name: Setup Node environment + if: ${{ inputs.client_type == 'node' }} + uses: ./.github/actions/setup-node + with: + node_version: '18' + - name: Setup Node environment + if: ${{ inputs.client_type == 'java' }} + uses: ./.github/actions/setup-java diff --git a/.github/workflows/_release.yaml b/.github/workflows/_release.yaml index 37a46984..5ebc2dd7 100644 --- a/.github/workflows/_release.yaml +++ b/.github/workflows/_release.yaml @@ -78,10 +78,9 @@ jobs: fetch-depth: 1 - name: Install Protoc uses: arduino/setup-protoc@v1 - - name: Setup Node environment - uses: ./.github/actions/setup-node + - uses: ./.github/actions/setup-language with: - node-version: '18' + client_type: ${{ inputs.client_type }} # - name: Publish # run: | # make ci/package/publish diff --git a/.github/workflows/_sync.yaml b/.github/workflows/_sync.yaml index f1e24a78..4f16e5ca 100644 --- a/.github/workflows/_sync.yaml +++ b/.github/workflows/_sync.yaml @@ -51,8 +51,6 @@ jobs: VALD_CHECKOUT_REF: ${{ inputs.vald_checkout_src_ref }} - name: Build proto run: | - # make ci/all - echo "Install dependencies" make ci/deps/install @@ -75,7 +73,9 @@ jobs: image_tag: ${{ env.IMAGE_TAG }} - name: Push run: | - git push + git push origin ${REF} + env: + REF: ${{ inputs.client_checkout_target_ref }} - name: Create tag if: ${{ inputs.enable_tag_push == true }} continue-on-error: true