From 030e833d8ef81fe5376665b2d7a8efd769841eb2 Mon Sep 17 00:00:00 2001
From: Klemen Tusar <techouse@gmail.com>
Date: Sun, 14 May 2023 05:28:34 +0100
Subject: [PATCH] :bookmark: release 6.1.2 (2nd attempt) (#420)

---
 .github/workflows/publish.yml         |  63 ++++++++++++++++----------
 .github/workflows/publish_dry_run.yml |  47 +++++++++++++++++++
 chopper/.DS_Store                     | Bin 6148 -> 0 bytes
 tool/publish.sh                       |  11 +++--
 4 files changed, 91 insertions(+), 30 deletions(-)
 create mode 100644 .github/workflows/publish_dry_run.yml
 delete mode 100644 chopper/.DS_Store

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index aea02d47..0eab9e8e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -2,45 +2,58 @@ name: Publish packages
 
 on:
   push:
-    branches: ['master']
+    branches:
+      - master
+defaults:
+  run:
+    shell: bash
+env:
+  PUB_ENVIRONMENT: bot.github
+permissions: read-all
 
 jobs:
   publish_chopper:
-      name: "Publish chopper"
-      runs-on: ubuntu-latest
-      steps:
-      - uses: dart-lang/setup-dart@v1.3
+    name: "Publish chopper"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dart-lang/setup-dart@v1
         with:
           sdk: stable
       - id: checkout
         uses: actions/checkout@v3
+      - id: credentials
+        run: |
+          mkdir -p $XDG_CONFIG_HOME/dart
+          echo '${{ secrets.PUB_CREDENTIALS }}' > "$XDG_CONFIG_HOME/dart/pub-credentials.json"
       - id: publish
         run: bash tool/publish.sh chopper
-        env:
-          CREDENTIAL_JSON: ${{ secrets.CREDENTIAL_JSON }}
   publish_chopper_generator:
     name: "Publish chopper_generator"
     runs-on: ubuntu-latest
     steps:
-    - uses: dart-lang/setup-dart@v1.3
-      with:
-        sdk: stable
-    - id: checkout
-      uses: actions/checkout@v3
-    - id: publish
-      run: bash tool/publish.sh chopper_generator
-      env:
-        CREDENTIAL_JSON: ${{ secrets.CREDENTIAL_JSON }}
+      - uses: dart-lang/setup-dart@v1
+        with:
+          sdk: stable
+      - id: checkout
+        uses: actions/checkout@v3
+      - id: credentials
+        run: |
+          mkdir -p $XDG_CONFIG_HOME/dart
+          echo '${{ secrets.PUB_CREDENTIALS }}' > "$XDG_CONFIG_HOME/dart/pub-credentials.json"
+      - id: publish
+        run: bash tool/publish.sh chopper_generator
   publish_chopper_built_value:
     name: "Publish chopper_built_value"
     runs-on: ubuntu-latest
     steps:
-    - uses: dart-lang/setup-dart@v1.3
-      with:
-        sdk: stable
-    - id: checkout
-      uses: actions/checkout@v3
-    - id: publish
-      run: bash tool/publish.sh chopper_built_value
-      env:
-        CREDENTIAL_JSON: ${{ secrets.CREDENTIAL_JSON }}
\ No newline at end of file
+      - uses: dart-lang/setup-dart@v1
+        with:
+          sdk: stable
+      - id: checkout
+        uses: actions/checkout@v3
+      - id: credentials
+        run: |
+          mkdir -p $XDG_CONFIG_HOME/dart
+          echo '${{ secrets.PUB_CREDENTIALS }}' > "$XDG_CONFIG_HOME/dart/pub-credentials.json"
+      - id: publish
+        run: bash tool/publish.sh chopper_built_value
\ No newline at end of file
diff --git a/.github/workflows/publish_dry_run.yml b/.github/workflows/publish_dry_run.yml
new file mode 100644
index 00000000..4e7fca02
--- /dev/null
+++ b/.github/workflows/publish_dry_run.yml
@@ -0,0 +1,47 @@
+name: Publish packages (dry run)
+
+on:
+  pull_request:
+    branches:
+      - master
+defaults:
+  run:
+    shell: bash
+env:
+  PUB_ENVIRONMENT: bot.github
+permissions: read-all
+
+jobs:
+  publish_chopper:
+    name: "Publish chopper (dry run)"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dart-lang/setup-dart@v1
+        with:
+          sdk: stable
+      - id: checkout
+        uses: actions/checkout@v3
+      - id: publish_dry_run
+        run: bash tool/publish.sh chopper --dry-run
+  publish_chopper_generator:
+    name: "Publish chopper_generator (dry run)"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dart-lang/setup-dart@v1
+        with:
+          sdk: stable
+      - id: checkout
+        uses: actions/checkout@v3
+      - id: publish_dry_run
+        run: bash tool/publish.sh chopper_generator --dry-run
+  publish_chopper_built_value:
+    name: "Publish chopper_built_value (dry run)"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dart-lang/setup-dart@v1
+        with:
+          sdk: stable
+      - id: checkout
+        uses: actions/checkout@v3
+      - id: publish_dry_run
+        run: bash tool/publish.sh chopper_built_value --dry-run
\ No newline at end of file
diff --git a/chopper/.DS_Store b/chopper/.DS_Store
deleted file mode 100644
index e8a2b199799712c46a4fa61772f920ea4f1144d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6148
zcmeHK%}T>S5dPK{+F}ny5IyGTso>d5S{t<B57-B&O<PJK+G2muTQ0tXui*3f0Q$}D
zQj)a2ipUJiew*EyotbY#HVeSCSEF;F0ia41JgBkRAu=zzB?o>){ES`W4GT=EeayD3
zb>J^DAbWR=0iLM|vimp3l6yJh%mPi$4Df`co6LrBGK=XYugnGY?Ar=^KpmI3Mhkbi
zLWCRK6PxrK75qL6en%KG(i&sDFwTV7N6g;H_M6OLjY)nD^Ilk^La$ew<(!p_^VT-g
zk4&Z|+Ds7_tR%0jRfRQlSyRM{dWiDY=A>X<#~dr>y&#TR(H_>!SHZ7_2S#Y2gInS*
zzR0twX0k7HZ^n$X%x47VpR;2i6=gsfPzH7|z%yH<dgxGFWk4BF1~v@H_aUGPh8|Og
z_S3<}UIB<@4qIVgehkGY@ECeb9dd?ZoGa0}8h^zw&Yk0dw+lU{4xKxUzkC=U+4viZ
zvC+AHV9jAdhuSIw%0Qlhl6!2(`5*1S|L2|bNf}TE{uKkJ-05}NEXkj(TgAy)8&Dsq
pB4U?1+_<n~k7C-&QG80Z!tp>l#L#2vkRufR5wJ99qYV5i13&D&iRl0U

diff --git a/tool/publish.sh b/tool/publish.sh
index 26340f52..f5b81db2 100644
--- a/tool/publish.sh
+++ b/tool/publish.sh
@@ -6,13 +6,14 @@ PKG=$1
 echo -e "\033[1mPKG: ${PKG}\033[22m"
 pushd "${PKG}"
 
-mkdir -p ~/.pub-cache
-
-echo $CREDENTIAL_JSON > ~/.pub-cache/credentials.json
-
 sed '/Comment before publish$/,+2 d' pubspec.yaml > pubspec.temp.yaml
 rm pubspec.yaml
 mv pubspec.temp.yaml pubspec.yaml
 
-dart pub publish -f
+if [ "$2" == "--dry-run" ]; then
+  dart pub publish --dry-run
+else
+  dart pub publish --force
+fi
+
 popd
\ No newline at end of file