diff --git a/.github/actions/setup-dart/action.yaml b/.github/actions/setup-dart/action.yaml deleted file mode 100644 index 18a9599..0000000 --- a/.github/actions/setup-dart/action.yaml +++ /dev/null @@ -1,30 +0,0 @@ -name: Setup Dart Environment -description: | - Composite action to setup Dart SDK and restore pub cache. - -inputs: - working-directory: - description: "The directory where the pub get command should be run" - required: false - default: "." - -runs: - using: composite - steps: - - name: Set up Dart - uses: dart-lang/setup-dart@v1 - with: - sdk: stable - - - name: Cache Pub dependencies - uses: actions/cache@v4 - with: - path: ~/.pub-cache - key: ${{ runner.os }}-pub-${{ hashFiles('**/pubspec.lock') }} - restore-keys: | - ${{ runner.os }}-pub- - - - name: Get dependencies - shell: bash - run: dart pub get - working-directory: ${{ inputs.working-directory }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index af43e06..652e33b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,21 +2,20 @@ name: CI on: push: + branches: [main] paths: - "lib/**" - "test/**" - "pubspec.yaml" - "example/**" - - ".github/workflows/ci.yaml" - - ".github/workflows/reusable_verify.yaml" + - ".github/workflows/**" pull_request: paths: - "lib/**" - "test/**" - "pubspec.yaml" - "example/**" - - ".github/workflows/ci.yaml" - - ".github/workflows/reusable_verify.yaml" + - ".github/workflows/**" workflow_dispatch: concurrency: @@ -53,7 +52,6 @@ jobs: uses: ./.github/workflows/reusable_verify.yaml with: working-directory: . - sdk: flutter secrets: inherit verify_example: @@ -62,5 +60,4 @@ jobs: uses: ./.github/workflows/reusable_verify.yaml with: working-directory: example - sdk: flutter secrets: inherit diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 338cdc1..52e0d79 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -4,7 +4,7 @@ on: push: branches: [main] tags: - - "*" + - "v[0-9]+.[0-9]+.[0-9]+" concurrency: group: ${{ github.workflow }}-${{ github.ref }} diff --git a/.github/workflows/reusable_verify.yaml b/.github/workflows/reusable_verify.yaml index 5bacf45..ba27576 100644 --- a/.github/workflows/reusable_verify.yaml +++ b/.github/workflows/reusable_verify.yaml @@ -8,11 +8,7 @@ on: required: false default: "." type: string - sdk: - description: 'Which SDK to use: "dart" or "flutter"' - required: false - default: "dart" - type: string + run-tests: description: "Whether to run tests" required: false @@ -40,14 +36,7 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup Dart Environment - if: ${{ inputs.sdk == 'dart' }} - uses: ./.github/actions/setup-dart - with: - working-directory: ${{ inputs.working-directory }} - - name: Setup Flutter Environment - if: ${{ inputs.sdk == 'flutter' }} uses: ./.github/actions/setup-flutter with: flutter-version: ${{ secrets.FLUTTER_VERSION }} @@ -67,21 +56,14 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup Dart Environment - if: ${{ inputs.sdk == 'dart' }} - uses: ./.github/actions/setup-dart - with: - working-directory: ${{ inputs.working-directory }} - - name: Setup Flutter Environment - if: ${{ inputs.sdk == 'flutter' }} uses: ./.github/actions/setup-flutter with: flutter-version: ${{ secrets.FLUTTER_VERSION }} working-directory: ${{ inputs.working-directory }} - name: Analyze code - run: dart analyze --fatal-infos . + run: flutter analyze --fatal-infos . working-directory: ${{ inputs.working-directory }} test: @@ -94,19 +76,12 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - - name: Setup Dart Environment - if: ${{ inputs.sdk == 'dart' }} - uses: ./.github/actions/setup-dart - with: - working-directory: ${{ inputs.working-directory }} - - name: Setup Flutter Environment - if: ${{ inputs.sdk == 'flutter' }} uses: ./.github/actions/setup-flutter with: flutter-version: ${{ secrets.FLUTTER_VERSION }} working-directory: ${{ inputs.working-directory }} - name: Run tests - run: ${{ inputs.sdk }} test + run: flutter test working-directory: ${{ inputs.working-directory }}