From 0962f0ec15bd66b0f96c447f69398f72296471fe Mon Sep 17 00:00:00 2001 From: asthamohta Date: Thu, 6 Feb 2025 08:50:13 +0000 Subject: [PATCH] changes --- .github/actions/setup-env/action.yml | 27 ++++++++++----------------- .github/workflows/spanner-pr.yml | 6 ++++++ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml index f89d171026..4f2a968de2 100644 --- a/.github/actions/setup-env/action.yml +++ b/.github/actions/setup-env/action.yml @@ -12,6 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. + +# Action used to set up the environment. This assumes that we are using +# a Linux-based VM. +# +# General steps are: +# 1. Set up Java, which templates and tests are written in +# 2. Set up Go, which our CI/CD programs are written in +# 3. Build everything under cicd/cmd +# 4. Gets all the changed files + name: 'Setup Environment' description: 'Sets up common environment for Dataflow Templates workflows' @@ -36,16 +46,6 @@ inputs: description: 'The version of Python to install' required: false default: '3.11' - node-version: - type: string - description: 'The version of Node.js to install' - required: false - default: '18' - angular-version: - type: string - description: 'The version of Angular CLI to install' - required: false - default: 'latest' runs: using: 'composite' @@ -74,10 +74,3 @@ runs: uses: actions/setup-python@82c7e631bb3cdc910f68e0081d67478d79c6982d with: python-version: ${{ inputs.python-version }} - - name: Setup Node.js and npm - uses: actions/setup-node@v4 - with: - node-version: ${{ inputs.node-version }} - - name: Install Angular CLI - shell: bash - run: npm install -g @angular/cli@${{ inputs.angular-version }} \ No newline at end of file diff --git a/.github/workflows/spanner-pr.yml b/.github/workflows/spanner-pr.yml index 21411f16a7..8779ce3af2 100644 --- a/.github/workflows/spanner-pr.yml +++ b/.github/workflows/spanner-pr.yml @@ -230,6 +230,12 @@ jobs: - name: Setup Environment id: setup-env uses: ./.github/actions/setup-env + - name: Install Node.js + uses: actions/setup-node@v4 + with: + node-version: 18 + - name: Install Angular CLI + run: npm install -g @angular/cli - name: Prepare Go Modules working-directory: ${{ github.workspace }}/spanner-migration-tool run: make build \ No newline at end of file