Try to fix execution of brew install (and usage of sed)

Adresses Homebrew/brew#5731
JabRef · Dec 17, 2019 · 3b258cd · 3b258cd
1 parent 5ddc087
commit 3b258cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
@@ -48,19 +48,6 @@ jobs:
     - name: Run GitVersion
       id: gitversion
       uses: gittools/actions/execute-gitversion@v0.3
-    - name: Upload to builds.jabref.org
-      run: |
-        mkdir -p build/distribution
-        touch build/distribution/test.rpm
-        touch build/distribution/test.deb
-        touch build/distribution/test.zip
-        touch build/distribution/test.dmg
-        scripts/upload-to-builds.jabref.org.sh
-      shell: bash
-      env:
-        PRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
-        branch: ${{ steps.gitversion.outputs.branchName }}
-        os: ${{ matrix.os }}
     - name: Set up JDK
       uses: actions/setup-java@v1
       with:
@@ -123,6 +110,15 @@ jobs:
         get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "${{ steps.gitversion.outputs.AssemblySemVer }}","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}"}
         get-childitem -Path build/distribution/* | rename-item -NewName {$_.name -replace "portable","${{ steps.gitversion.outputs.Major }}.${{ steps.gitversion.outputs.Minor }}-portable"}
       shell: pwsh
+    - name: Upload to builds.jabref.org
+      run: |
+        mkdir -p build/distribution
+        scripts/upload-to-builds.jabref.org.sh
+      shell: bash
+      env:
+        PRIVATEKEY: ${{ secrets.buildJabRefPrivateKey }}
+        branch: ${{ steps.gitversion.outputs.branchName }}
+        os: ${{ matrix.os }}
     - name: Upload to GitHub workflow artifacts store
       uses: actions/upload-artifact@master
       with:

diff --git a/scripts/upload-to-builds.jabref.org.sh b/scripts/upload-to-builds.jabref.org.sh
@@ -16,7 +16,8 @@ case "$os" in
   macOS-latest)    command="${command}rm *.dmg\nrm *.pkg\nrm *_macos.tar.gz\n"
                    suffix=".tar.gz"
                    filepattern="macos"
-                   brew install --with-default-names gnu-sed ;;
+                   brew install gnu-sed
+                   PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH" ;;
   windows-latest)  command="${command}rm *.msi\nrm *_windows.zip"
                    suffix=".zip"
                    filepattern="windows" ;;