From 322115f89b36c0013e4ef55bc84040c8004747d2 Mon Sep 17 00:00:00 2001
From: Thibaut Mattio <thibaut.mattio@gmail.com>
Date: Mon, 9 Mar 2020 00:26:30 -0400
Subject: [PATCH] Fix CI/CD publish step

---
 .github/workflows/release.yml | 11 +++--------
 scripts/release.sh            |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index add2e6c..fa2e753 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -19,11 +19,6 @@ jobs:
       - name: Fetch git tags
         run: git fetch --tags --force
 
-      - name: Print git describe
-        run: |
-          tag=$(git describe --always --dirty)
-          echo "${tag}"
-
       - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:
@@ -61,9 +56,6 @@ jobs:
       - name: Substitute watermarks
         run: esy dune subst
 
-      - name: cat package.json
-        run: cat scripts/release-make-skeleton.js
-
       - name: Build subst changes
         run: esy dune build
 
@@ -95,6 +87,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
+      - name: Fetch git tags
+        run: git fetch --tags --force
+
       - name: Use Node.js 12.x
         uses: actions/setup-node@v1
         with:
diff --git a/scripts/release.sh b/scripts/release.sh
index 95de4ff..bc309a1 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -16,8 +16,8 @@ if [ -d ".git" ]; then
     esy x dune-release tag
     esy x dune-release distrib --skip-tests
     esy x dune-release publish distrib -y
-    # esy x dune-release opam pkg
-    # esy x dune-release opam submit --no-auto-open -y
+    esy x dune-release opam pkg
+    esy x dune-release opam submit --no-auto-open -y
   fi
 else
   echo "This project is not a git repository. Run `git init` first to be able to release."