From 16c91946780d4e3146dd64962d68b56797b27486 Mon Sep 17 00:00:00 2001 From: Gabber235 Date: Fri, 24 Nov 2023 17:07:12 +0100 Subject: [PATCH] Use new composite actions --- .github/actions/build-plugin/action.yml | 1 - .github/workflows/build-adapter.yml | 10 ++------- .github/workflows/build-plugin.yml | 30 ++----------------------- 3 files changed, 4 insertions(+), 37 deletions(-) diff --git a/.github/actions/build-plugin/action.yml b/.github/actions/build-plugin/action.yml index 7ecf405dfa..9825211e45 100644 --- a/.github/actions/build-plugin/action.yml +++ b/.github/actions/build-plugin/action.yml @@ -4,7 +4,6 @@ description: "Builds the plugin and runs tests" runs: using: "composite" steps: - - uses: actions/checkout@v2 - name: Setup Flutter uses: subosito/flutter-action@v2 with: diff --git a/.github/workflows/build-adapter.yml b/.github/workflows/build-adapter.yml index 66a9b12a9e..818ae59b2f 100644 --- a/.github/workflows/build-adapter.yml +++ b/.github/workflows/build-adapter.yml @@ -19,16 +19,10 @@ jobs: with: distribution: temurin java-version: 17 - - name: Test Adapter - uses: gradle/gradle-build-action@v2 - with: - arguments: test --scan - build-root-directory: ./adapters/${{ inputs.adapter }} - name: Build Adapter - uses: gradle/gradle-build-action@v2 + uses: ./.github/actions/build-adapter with: - arguments: buildRelease --scan - build-root-directory: ./adapters/${{ inputs.adapter }} + adapter: ${{ inputs.adapter }} - name: Upload Adapter uses: actions/upload-artifact@v2 with: diff --git a/.github/workflows/build-plugin.yml b/.github/workflows/build-plugin.yml index 79bb9fa092..2aa9371b82 100644 --- a/.github/workflows/build-plugin.yml +++ b/.github/workflows/build-plugin.yml @@ -6,35 +6,9 @@ jobs: build: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Setup Flutter - uses: subosito/flutter-action@v2 - with: - channel: "master" - - name: Get Flutter dependencies - run: flutter pub get - working-directory: ./app - - name: Run tests - run: flutter test - working-directory: ./app - - name: Build web app - run: flutter build web --release --no-tree-shake-icons - working-directory: ./app - - name: Setup Java - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 17 - - name: Test Plugin - uses: gradle/gradle-build-action@v2 - with: - arguments: test --scan - build-root-directory: ./plugin + - uses: actions/checkout@v3 - name: Build Plugin - uses: gradle/gradle-build-action@v2 - with: - arguments: buildRelease --scan - build-root-directory: ./plugin + uses: ./.github/actions/build-plugin - name: Upload Plugin uses: actions/upload-artifact@v2 with: