From ce96aa353d4d8b576155ad2bd473c4327e1da4e0 Mon Sep 17 00:00:00 2001 From: Liam Appelbe Date: Wed, 18 Dec 2024 15:45:31 +1100 Subject: [PATCH] Revert workflow changes --- .github/workflows/ffigen.yml | 218 ++++++++++++++++++----------------- 1 file changed, 110 insertions(+), 108 deletions(-) diff --git a/.github/workflows/ffigen.yml b/.github/workflows/ffigen.yml index ecc312f2a..6e1690b92 100644 --- a/.github/workflows/ffigen.yml +++ b/.github/workflows/ffigen.yml @@ -23,52 +23,52 @@ env: jobs: # Check code formatting and static analysis on a single OS (macos). - # analyze: - # runs-on: macos-latest - # defaults: - # run: - # working-directory: pkgs/ffigen/ - # strategy: - # fail-fast: false - # steps: - # - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - # - uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 - # with: - # channel: 'stable' - # - id: install - # name: Install dependencies - # run: flutter pub get && flutter pub get --directory="example/shared_bindings" && flutter pub get --directory="../objective_c" - # - name: Check formatting - # run: dart format --output=none --set-exit-if-changed . - # if: always() && steps.install.outcome == 'success' - # - name: Build test dylib and bindings - # run: dart test/setup.dart - # - name: Analyze code - # run: flutter analyze --fatal-infos + analyze: + runs-on: macos-latest + defaults: + run: + working-directory: pkgs/ffigen/ + strategy: + fail-fast: false + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 + with: + channel: 'stable' + - id: install + name: Install dependencies + run: flutter pub get && flutter pub get --directory="example/shared_bindings" && flutter pub get --directory="../objective_c" + - name: Check formatting + run: dart format --output=none --set-exit-if-changed . + if: always() && steps.install.outcome == 'success' + - name: Build test dylib and bindings + run: dart test/setup.dart + - name: Analyze code + run: flutter analyze --fatal-infos - # test-linux: - # needs: analyze - # runs-on: ubuntu-22.04 - # defaults: - # run: - # working-directory: pkgs/ffigen/ - # steps: - # - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - # - uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 - # with: - # channel: 'stable' - # - name: Install dependencies - # run: flutter pub get - # - name: Install libclang-14-dev - # run: sudo apt-get install libclang-14-dev - # - name: Build test dylib and bindings - # run: dart test/setup.dart - # - name: Run VM tests - # run: dart test + test-linux: + needs: analyze + runs-on: ubuntu-22.04 + defaults: + run: + working-directory: pkgs/ffigen/ + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 + with: + channel: 'stable' + - name: Install dependencies + run: flutter pub get + - name: Install libclang-14-dev + run: sudo apt-get install libclang-14-dev + - name: Build test dylib and bindings + run: dart test/setup.dart + - name: Run VM tests + run: dart test # Keep in sync with ffigen_weekly.yaml:test-mac-arm64 test-mac: - # needs: analyze + needs: analyze runs-on: 'macos-latest' defaults: run: @@ -80,57 +80,59 @@ jobs: channel: 'stable' - name: Install dependencies run: flutter pub get && flutter pub get --directory="../objective_c" - - name: Run VM tests - run: fail_count=0; for i in {1..10}; do dart test/setup.dart && dart test || ((fail_count++)); done; if ((fail_count > 0)); then echo "There were $fail_count failures"; exit 1; fi - # - name: Upload coverage - # uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 - # with: - # flag-name: ffigen - # github-token: ${{ secrets.GITHUB_TOKEN }} - # parallel: true - # path-to-lcov: pkgs/ffigen/coverage/lcov.info - # - name: Upload coverage - # uses: coverallsapp/github-action@643bc377ffa44ace6394b2b5d0d3950076de9f63 - # with: - # carryforward: "ffigen,jni,jnigen,native_assets_builder_macos,native_assets_builder_ubuntu,native_assets_builder_windows,native_assets_cli_macos,native_assets_cli_ubuntu,native_assets_cli_windows,native_toolchain_c_macos,native_toolchain_c_ubuntu,native_toolchain_c_windows,objective_c,swift2objc" - # github-token: ${{ secrets.GITHUB_TOKEN }} - # parallel-finished: true + - name: Build test dylib and bindings + run: dart test/setup.dart + - name: Run VM tests and collect coverage + run: dart run coverage:test_with_coverage --scope-output=ffigen --scope-output=objective_c + - name: Upload coverage + uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 + with: + flag-name: ffigen + github-token: ${{ secrets.GITHUB_TOKEN }} + parallel: true + path-to-lcov: pkgs/ffigen/coverage/lcov.info + - name: Upload coverage + uses: coverallsapp/github-action@cfd0633edbd2411b532b808ba7a8b5e04f76d2c8 + with: + carryforward: "ffigen,jni,jnigen,native_assets_builder_macos,native_assets_builder_ubuntu,native_assets_builder_windows,native_assets_cli_macos,native_assets_cli_ubuntu,native_assets_cli_windows,native_toolchain_c_macos,native_toolchain_c_ubuntu,native_toolchain_c_windows,objective_c,swift2objc" + github-token: ${{ secrets.GITHUB_TOKEN }} + parallel-finished: true - # test-mac-flutter: - # needs: analyze - # runs-on: 'macos-latest' - # defaults: - # run: - # working-directory: pkgs/ffigen/ - # steps: - # - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - # - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 - # with: - # channel: 'stable' - # - name: Install dependencies - # run: flutter pub get && flutter pub get --directory="../objective_c" - # - name: Build test dylib and bindings - # run: dart test/setup.dart --main-thread-dispatcher - # - name: Run Flutter tests - # run: flutter test + test-mac-flutter: + needs: analyze + runs-on: 'macos-latest' + defaults: + run: + working-directory: pkgs/ffigen/ + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 + with: + channel: 'stable' + - name: Install dependencies + run: flutter pub get && flutter pub get --directory="../objective_c" + - name: Build test dylib and bindings + run: dart test/setup.dart --main-thread-dispatcher + - name: Run Flutter tests + run: flutter test - # test-windows: - # needs: analyze - # runs-on: windows-latest - # defaults: - # run: - # working-directory: pkgs/ffigen/ - # steps: - # - uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 - # - uses: subosito/flutter-action@44ac965b96f18d999802d4b807e3256d5a3f9fa1 - # with: - # channel: 'stable' - # - name: Install dependencies - # run: flutter pub get - # - name: Build test dylib and bindings - # run: dart test/setup.dart - # - name: Run VM tests - # run: dart test + test-windows: + needs: analyze + runs-on: windows-latest + defaults: + run: + working-directory: pkgs/ffigen/ + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 + with: + channel: 'stable' + - name: Install dependencies + run: flutter pub get + - name: Build test dylib and bindings + run: dart test/setup.dart + - name: Run VM tests + run: dart test # Sanity check the latest `flutter create --template plugin_ffi`. # This will break if we change the Flutter template or the generated code. @@ -142,20 +144,20 @@ jobs: # merge PRs. # Running this sanity check on one OS should be sufficient. Chosing Windows # because it is the most likely to break. - # test-windows-flutter: - # needs: analyze - # runs-on: windows-latest - # defaults: - # run: - # working-directory: pkgs/ffigen/ - # steps: - # - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - # - uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 - # with: - # channel: "master" - # - name: Install dependencies - # run: flutter pub get - # - name: Build test dylib and bindings - # run: dart test/setup.dart - # - name: Run VM tests - # run: flutter pub run test test_flutter/ + test-windows-flutter: + needs: analyze + runs-on: windows-latest + defaults: + run: + working-directory: pkgs/ffigen/ + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + - uses: subosito/flutter-action@74af56c5ed2697ba4621264652728e8d217e53d3 + with: + channel: "master" + - name: Install dependencies + run: flutter pub get + - name: Build test dylib and bindings + run: dart test/setup.dart + - name: Run VM tests + run: flutter pub run test test_flutter/