👷 use yq to manipulate pubspec.yaml in publish CI (#471)

lejard-h · Aug 7, 2023 · 2e00b6a · 2e00b6a
1 parent 8dbde76
commit 2e00b6a
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 26 deletions.
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -74,11 +74,16 @@ jobs:
         run: |
           set -e
           mkdir -p $XDG_CONFIG_HOME/dart
-          echo '${{ secrets.CREDENTIAL_JSON }}' > "$XDG_CONFIG_HOME/dart/pub-credentials.json"
+          echo -n '${{ secrets.CREDENTIAL_JSON }}' > $XDG_CONFIG_HOME/dart/pub-credentials.json
       - name: Publish
         id: publish
         if: ${{ env.IS_VERSION_GREATER == 1 }}
-        run: bash tool/publish.sh ${{ matrix.package }}
+        run: |
+          set -e
+          pushd ${{ matrix.package }} || exit
+          yq -i 'del(.dependency_overrides)' pubspec.yaml
+          dart pub publish --force
+          popd || exit
       - name: Skip publish
         id: skip_publish
         if: ${{ env.IS_VERSION_GREATER == 0 }}
@@ -87,4 +92,4 @@ jobs:
         id: cleanup
         if: ${{ always() }}
         run: |
-          rm -rf "$XDG_CONFIG_HOME/dart/pub-credentials.json"
+          rm -rf $XDG_CONFIG_HOME/dart/pub-credentials.json
diff --git a/.github/workflows/publish_dry_run.yml b/.github/workflows/publish_dry_run.yml
@@ -70,8 +70,13 @@ jobs:
       - name: Publish (dry run)
         id: publish_dry_run
         if: ${{ env.IS_VERSION_GREATER == 1 }}
-        run: bash tool/publish.sh ${{ matrix.package }} --dry-run
+        run: |
+          set -e
+          pushd ${{ matrix.package }} || exit
+          yq -i 'del(.dependency_overrides)' pubspec.yaml
+          dart pub publish --dry-run
+          popd || exit
       - name: Skip publish (dry run)
         id: skip_publish_dry_run
         if: ${{ env.IS_VERSION_GREATER == 0 }}
-        run: echo "Skipping publish (dry run) for ${{ matrix.package }} because the version is not greater than the one on pub.dev"
+        run: echo "Skipping publish (dry run) for ${{ matrix.package }} because the version is not greater than the one on pub.dev"
diff --git a/chopper/pubspec.yaml b/chopper/pubspec.yaml
@@ -25,5 +25,8 @@ dev_dependencies:
   lints: ^2.1.1
   test: ^1.24.4
   transparent_image: ^2.0.1
+  chopper_generator: ^7.0.0
+
+dependency_overrides:
   chopper_generator:
     path: ../chopper_generator
diff --git a/chopper_built_value/pubspec.yaml b/chopper_built_value/pubspec.yaml
@@ -21,6 +21,5 @@ dev_dependencies:
   lints: ^2.1.1
 
 dependency_overrides:
-  # Comment before publish
   chopper:
     path: ../chopper
diff --git a/chopper_generator/pubspec.yaml b/chopper_generator/pubspec.yaml
@@ -26,6 +26,5 @@ dev_dependencies:
   test: ^1.24.4
 
 dependency_overrides:
-  # Comment before publish
   chopper:
     path: ../chopper
diff --git a/tool/publish.sh b/tool/publish.sh