From 4411ef25b08a85b433f3699d51125baef1519160 Mon Sep 17 00:00:00 2001 From: MartinBraquet Date: Sun, 1 Mar 2026 04:46:12 +0100 Subject: [PATCH] Re-use node setup in CD workflows --- .github/workflows/cd-android-live-update.yml | 14 +++----------- .github/workflows/cd-android.yml | 12 ++---------- .github/workflows/cd-api.yml | 14 +++----------- 3 files changed, 8 insertions(+), 32 deletions(-) diff --git a/.github/workflows/cd-android-live-update.yml b/.github/workflows/cd-android-live-update.yml index 2114750e..5ce33a8f 100644 --- a/.github/workflows/cd-android-live-update.yml +++ b/.github/workflows/cd-android-live-update.yml @@ -1,7 +1,7 @@ name: CD Android Live Update on: push: - branches: [main, master] + branches: [ main, master ] paths: - 'android/capawesome.json' - '.github/workflows/cd-android-live-update.yml' @@ -54,16 +54,8 @@ jobs: if: needs.check-version.outputs.changed == 'true' steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '22' - - - name: Install dependencies - run: yarn install + - uses: actions/checkout@v4 + - uses: ./.github/actions/setup - name: Deploy Live Update env: diff --git a/.github/workflows/cd-android.yml b/.github/workflows/cd-android.yml index dcac1e90..52b35b93 100644 --- a/.github/workflows/cd-android.yml +++ b/.github/workflows/cd-android.yml @@ -50,8 +50,8 @@ jobs: if: needs.check-version.outputs.should_build == 'true' steps: - - name: Checkout repository - uses: actions/checkout@v4 + - uses: actions/checkout@v4 + - uses: ./.github/actions/setup - name: Set up JDK uses: actions/setup-java@v4 @@ -60,14 +60,6 @@ jobs: java-version: 21 cache: gradle - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '22' - - - name: Install dependencies - run: yarn install - - name: Compile Web App into Android assets env: NEXT_PUBLIC_FIREBASE_API_KEY: ${{ secrets.NEXT_PUBLIC_FIREBASE_API_KEY }} diff --git a/.github/workflows/cd-api.yml b/.github/workflows/cd-api.yml index f1655e91..5a311032 100644 --- a/.github/workflows/cd-api.yml +++ b/.github/workflows/cd-api.yml @@ -1,7 +1,7 @@ name: API Release on: push: - branches: [main, master] + branches: [ main, master ] paths: - 'backend/api/package.json' - '.github/workflows/cd-api.yml' @@ -54,16 +54,8 @@ jobs: if: needs.check-version.outputs.changed == 'true' steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup Node.js - uses: actions/setup-node@v4 - with: - node-version: '22' - - - name: Install dependencies - run: yarn install + - uses: actions/checkout@v4 + - uses: ./.github/actions/setup - name: Authenticate to GCP uses: google-github-actions/auth@v2