Merge pull request #475 from sunbeam-labs/472-452-release

4.5.2.dev3 release
sunbeam-labs · Apr 2, 2024 · ca5a97d · ca5a97d
2 parents eb3ea73 + 0d7f38d
commit ca5a97d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 8 deletions.
diff --git a/.github/workflows/dockerhub.yml b/.github/workflows/dockerhub.yml
@@ -99,9 +99,12 @@ jobs:
 
           - name: Generate image report
             id: report
+            # Replace '\n' with '%0A' for embedding into release notes (for somer reason '\n' is not escaped)
             run: |
-              echo "package_versions=$(docker run --rm sunbeamlabs/sunbeam:${{ inputs.version }} cat installed_packages.txt)" >> "$GITHUB_OUTPUT"
-              echo "package_versions_slim=$(docker run --rm sunbeamlabs/sunbeam:${{ inputs.version }}-slim cat installed_packages.txt)" >> "$GITHUB_OUTPUT"
+              IP=$(docker run --rm sunbeamlabs/sunbeam:${{ inputs.version }} cat installed_packages.txt)
+              echo "package_versions=${IP//$'\n'/'%0A'}" >> "$GITHUB_OUTPUT"
+              IP=$(docker run --rm sunbeamlabs/sunbeam:${{ inputs.version }}-slim cat installed_packages.txt)
+              echo "package_versions_slim=${IP//$'\n'/'%0A'}" >> "$GITHUB_OUTPUT"
 
     push-cutadapt-dockerhub:
       name: Push cutadapt env to Dockerhub
@@ -137,7 +140,9 @@ jobs:
         - name: Generate image report
           id: report
           run: |
-            echo "package_versions=$(docker run --rm sunbeamlabs/cutadapt:${{ inputs.version }} cat installed_packages.txt)" >> "$GITHUB_OUTPUT"
+            IP=$(docker run --rm sunbeamlabs/cutadapt:${{ inputs.version }} cat installed_packages.txt)
+            echo $IP
+            echo "package_versions=${IP//$'\n'/'%0A'}" >> "$GITHUB_OUTPUT"
 
     push-komplexity-dockerhub:
       name: Push komplexity env to Dockerhub
@@ -173,7 +178,9 @@ jobs:
         - name: Generate image report
           id: report
           run: |
-            echo "package_versions=$(docker run --rm sunbeamlabs/komplexity:${{ inputs.version }} cat installed_packages.txt)" >> "$GITHUB_OUTPUT"
+            IP=$(docker run --rm sunbeamlabs/komplexity:${{ inputs.version }} cat installed_packages.txt)
+            echo $IP
+            echo "package_versions=${IP//$'\n'/'%0A'}" >> "$GITHUB_OUTPUT"
 
     push-qc-dockerhub:
       name: Push qc env to Dockerhub
@@ -209,7 +216,9 @@ jobs:
         - name: Generate image report
           id: report
           run: |
-            echo "package_versions=$(docker run --rm sunbeamlabs/qc:${{ inputs.version }} cat installed_packages.txt)" >> "$GITHUB_OUTPUT"
+            IP=$(docker run --rm sunbeamlabs/qc:${{ inputs.version }} cat installed_packages.txt)
+            echo $IP
+            echo "package_versions=${IP//$'\n'/'%0A'}" >> "$GITHUB_OUTPUT"
 
     push-reports-dockerhub:
       name: Push reports env to Dockerhub
@@ -245,4 +254,6 @@ jobs:
         - name: Generate image report
           id: report
           run: |
-            echo "package_versions=$(docker run --rm sunbeamlabs/reports:${{ inputs.version }} cat installed_packages.txt)" >> "$GITHUB_OUTPUT"
+            IP=$(docker run --rm sunbeamlabs/reports:${{ inputs.version }} cat installed_packages.txt)
+            echo $IP
+            echo "package_versions=${IP//$'\n'/'%0A'}" >> "$GITHUB_OUTPUT"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -58,6 +58,12 @@ jobs:
           - name: Generate Tarball
             run: bash dev_scripts/generate_archive.sh
 
+          - name: Upload Tarball
+            uses: actions/upload-artifact@v2
+            with:
+              name: sunbeam.tar.gz
+              path: sunbeam.tar.gz
+
           - name: Add Tarball to Release
             uses: irongut/[email protected]
             with:
@@ -114,7 +120,7 @@ jobs:
             with:
               token: ${{ secrets.GITHUB_TOKEN }}
               id: ${{ github.event.release.id }}
-              body: "### sunbeamlabs/sunbeam\n${{ needs.push-dockerhub.outputs.sunbeam_package_versions }}\n### sunbeamlabs/cutadapt\n${{ needs.push-dockerhub.outputs.cutadapt_package_versions }}\n### sunbeamlabs/komplexity\n${{ needs.push-dockerhub.outputs.komplexity_package_versions }}\n### sunbeamlabs/qc\n${{ needs.push-dockerhub.outputs.qc_package_versions }}\n### sunbeamlabs/reports\n${{ needs.push-dockerhub.outputs.reports_package_versions }}"
+              body: "### sunbeamlabs/sunbeam\n${{ needs.push-dockerhub.outputs.sunbeam_package_versions }}\n### sunbeamlabs/sunbeam:slim\n${{ needs.push-dockerhub.outputs.sunbeam_package_versions_slim }}\n### sunbeamlabs/cutadapt\n${{ needs.push-dockerhub.outputs.cutadapt_package_versions }}\n### sunbeamlabs/komplexity\n${{ needs.push-dockerhub.outputs.komplexity_package_versions }}\n### sunbeamlabs/qc\n${{ needs.push-dockerhub.outputs.qc_package_versions }}\n### sunbeamlabs/reports\n${{ needs.push-dockerhub.outputs.reports_package_versions }}"
               replacebody: false
 
     run-integration-tests:

diff --git a/install.sh b/install.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 __conda_url=https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
-__version_tag=$(if git describe --tags >/dev/null 2>&1 ; then git describe --tags; else echo v4.5.2.dev2; fi) # <--- Update this on each version release
+__version_tag=$(if git describe --tags >/dev/null 2>&1 ; then git describe --tags; else echo v4.5.2.dev3; fi) # <--- Update this on each version release
 __version_tag="${__version_tag:1}" # Remove the 'v' prefix
 
 read -r -d '' __usage <<-'EOF'