From 5d3f8d132d255dbd7c507cf7e651ca66ffaef649 Mon Sep 17 00:00:00 2001
From: Malin Errenst <m.errenst@famedly.com>
Date: Fri, 26 Aug 2022 14:18:01 +0200
Subject: [PATCH] fix: Fix for tag version publishing

---
 .gitlab-ci.yml | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b19ced69..02e44e1e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,41 +62,19 @@ dry-run:
 pub-dev:
   stage: publish
   image: dart
+  dependencies: [dry-run]
   script:
     - rm -rf ./docs
     - |
-      if [ -z "${PUB_DEV_PUBLISH_ACCESS_TOKEN}" ]; then
-        echo "Missing PUB_DEV_PUBLISH_ACCESS_TOKEN environment variable"
+      if [ -z "${PUB_DEV_CREDENTIALS}" ]; then
+        echo "Missing PUB_DEV_CREDENTIALS environment variable"
         exit 1
       fi
 
-      if [ -z "${PUB_DEV_PUBLISH_REFRESH_TOKEN}" ]; then
-        echo "Missing PUB_DEV_PUBLISH_REFRESH_TOKEN environment variable"
-        exit 1
-      fi
+      mkdir -p ~/.config/dart/
+      cp "${PUB_DEV_CREDENTIALS}" ~/.config/dart/pub-credentials.json
 
-      if [ -z "${PUB_DEV_PUBLISH_TOKEN_ENDPOINT}" ]; then
-        echo "Missing PUB_DEV_PUBLISH_TOKEN_ENDPOINT environment variable"
-        exit 1
-      fi
-
-      if [ -z "${PUB_DEV_PUBLISH_EXPIRATION}" ]; then
-        echo "Missing PUB_DEV_PUBLISH_EXPIRATION environment variable"
-        exit 1
-      fi
-      
-      mkdir -p ~/.pub-cache
-
-      cat <<EOF > ~/.pub-cache/credentials.json
-      {
-        "accessToken":"$(echo "${PUB_DEV_PUBLISH_ACCESS_TOKEN}" | base64 -d)",
-        "refreshToken":"$(echo "${PUB_DEV_PUBLISH_REFRESH_TOKEN}" | base64 -d)",
-        "tokenEndpoint":"${PUB_DEV_PUBLISH_TOKEN_ENDPOINT}",
-        "scopes":["https://www.googleapis.com/auth/userinfo.email","openid"],
-        "expiration":${PUB_DEV_PUBLISH_EXPIRATION}
-      }
-      EOF
     - dart pub get
-    - dart pub publish --force
+    - dart pub publish
   rules:
     - if: $CI_COMMIT_TAG