From df7b5bc968db0293e49bd84f1f40ebd9d4102b81 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Mon, 2 Nov 2020 16:30:38 +0100 Subject: [PATCH 1/3] Change CI to support the new naming schema --- .github/workflows/ci.yaml | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 29b4f7ea5216..c5ecc32b1c3d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,7 +2,15 @@ name: Dotty CI on: push: + paths-ignore: + # Do not run everything on changes only in docs + - 'scala3doc/**' + - 'scala3doc-testcases/**' pull_request: + paths-ignore: + # Do not run everything on changes only in docs + - 'scala3doc/**' + - 'scala3doc-testcases/**' schedule: - cron: '0 3 * * *' # Every day at 3 AM @@ -372,9 +380,9 @@ jobs: - name: Publish Release run: | ./project/scripts/sbt dist/packArchive - sha256sum dist/target/dotty-* > dist/target/sha256sum.txt + sha256sum dist/target/scala3-* > dist/target/sha256sum.txt ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleRelease" - echo "name=RELEASE_TAG::${GITHUB_REF#*refs/tags/}" >> $GITHUB_ENV + echo "::set-env name=RELEASE_TAG::${GITHUB_REF#*refs/tags/}" - name: Create GitHub Release id: create_gh_release @@ -386,7 +394,7 @@ jobs: release_name: ${{ github.ref }} body: draft: false - prerelease: ${{ contains(env.RELEASE_TAG, 'RC') }} + prerelease: ${{ contains(env.RELEASE_TAG, 'M') }} - name: Upload zip archive to GitHub Release uses: actions/upload-release-asset@v1 @@ -394,8 +402,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_gh_release.outputs.upload_url }} - asset_path: ./dist/target/dotty-${{ env.RELEASE_TAG }}.zip - asset_name: dotty-${{ env.RELEASE_TAG }}.zip + asset_path: ./dist/target/scala3-${{ env.RELEASE_TAG }}.zip + asset_name: scala-${{ env.RELEASE_TAG }}.zip asset_content_type: application/zip - name: Upload tar.gz archive to GitHub Release @@ -404,8 +412,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ steps.create_gh_release.outputs.upload_url }} - asset_path: ./dist/target/dotty-${{ env.RELEASE_TAG }}.tar.gz - asset_name: dotty-${{ env.RELEASE_TAG }}.tar.gz + asset_path: ./dist/target/scala3-${{ env.RELEASE_TAG }}.tar.gz + asset_name: scala-${{ env.RELEASE_TAG }}.tar.gz asset_content_type: application/gzip - name: Upload SHA256 sum of the release artefacts to GitHub Release From b0dfbac784a685492e1c2127cc524a4852c130fb Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Tue, 3 Nov 2020 14:19:49 +0100 Subject: [PATCH 2/3] Rename the assets published to GH Releases --- .github/workflows/ci.yaml | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index c5ecc32b1c3d..2a0c66c10da4 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -2,15 +2,7 @@ name: Dotty CI on: push: - paths-ignore: - # Do not run everything on changes only in docs - - 'scala3doc/**' - - 'scala3doc-testcases/**' pull_request: - paths-ignore: - # Do not run everything on changes only in docs - - 'scala3doc/**' - - 'scala3doc-testcases/**' schedule: - cron: '0 3 * * *' # Every day at 3 AM @@ -382,7 +374,7 @@ jobs: ./project/scripts/sbt dist/packArchive sha256sum dist/target/scala3-* > dist/target/sha256sum.txt ./project/scripts/sbtPublish ";project scala3-bootstrapped ;publishSigned ;sonatypeBundleRelease" - echo "::set-env name=RELEASE_TAG::${GITHUB_REF#*refs/tags/}" + echo "name=RELEASE_TAG::${GITHUB_REF#*refs/tags/}" >> $GITHUB_ENV - name: Create GitHub Release id: create_gh_release From 244b83436fe47e91e82fc37dbf3918151e8ddc61 Mon Sep 17 00:00:00 2001 From: Anatolii Kmetiuk Date: Tue, 24 Nov 2020 17:46:39 +0100 Subject: [PATCH 3/3] Align names of uploaded assets with sha256 hash computation. --- .github/workflows/ci.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2a0c66c10da4..a2b9b6f869a9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -395,7 +395,7 @@ jobs: with: upload_url: ${{ steps.create_gh_release.outputs.upload_url }} asset_path: ./dist/target/scala3-${{ env.RELEASE_TAG }}.zip - asset_name: scala-${{ env.RELEASE_TAG }}.zip + asset_name: scala3-${{ env.RELEASE_TAG }}.zip asset_content_type: application/zip - name: Upload tar.gz archive to GitHub Release @@ -405,7 +405,7 @@ jobs: with: upload_url: ${{ steps.create_gh_release.outputs.upload_url }} asset_path: ./dist/target/scala3-${{ env.RELEASE_TAG }}.tar.gz - asset_name: scala-${{ env.RELEASE_TAG }}.tar.gz + asset_name: scala3-${{ env.RELEASE_TAG }}.tar.gz asset_content_type: application/gzip - name: Upload SHA256 sum of the release artefacts to GitHub Release