diff --git a/.github/workflows/matrix_build.yml b/.github/workflows/matrix_build.yml index bd9a1439..6e9bdb76 100644 --- a/.github/workflows/matrix_build.yml +++ b/.github/workflows/matrix_build.yml @@ -28,6 +28,7 @@ jobs: fail-fast: false matrix: platform: +<<<<<<< HEAD - hi3516av100 - hi3516cv200 - hi3519v101 @@ -38,6 +39,12 @@ jobs: # hi3516cv300 # hi3516cv500 # hi3516ev200 +======= + - hi3516cv200 + - hi3516cv300 + - hi3516cv500 + - hi3516ev200 +>>>>>>> 97bedb13 ([ci skip] Disable everything else) - ak3918ev300 - gk7102 @@ -147,7 +154,6 @@ jobs: strategy: fail-fast: false matrix: -<<<<<<< HEAD platform: - hi3516av100 - hi3516dv100 @@ -179,23 +185,6 @@ jobs: release: fpv - platform: gk7205v300 release: fpv - #latform: - # - hi3516ev200 - # - hi3516ev300 - # - hi3518ev300 - # - hi3516dv200 - #elease: - # - lite - # - ultimate - include: - # - platform: hi3518ev200 - # release: mini - # - platform: hi3516cv300 - # release: mini - # - platform: hi3516ev200 - # release: fpv - # - platform: hi3516ev300 - # release: fpv # TODO - platform: ak3916ev300 @@ -223,9 +212,6 @@ jobs: release: ultimate - platform: gk7202v300 release: ultimate - #xclude: - # - platform: hi3516dv200 - # release: ultimate steps: