diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 85766dba1b49..e380e7940166 100644 --- 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 index fe7e64e07510..e3905562303a 100755 --- 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" ;;