Merge pull request #8 from dfinity/or-cleanup

Clean up release details
dfinity · Aug 8, 2024 · 8a47e1d · 8a47e1d
2 parents 1693acf + 905962d
commit 8a47e1d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/targets.yml b/.github/workflows/targets.yml
@@ -107,17 +107,21 @@ jobs:
             ghcr.io/dfinity/kernel-builder:${{ env.BUILDER_REF }} \
               bash /local/build/kernel.sh
 
+      - name: Set short sha
+        run: echo "SHORT_SHA=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
+
       - name: Publish
         uses: softprops/action-gh-release@v1
         with:
           token: ${{ secrets.RELEASE_ACCESS_TOKEN }}
-          tag_name: ${{ matrix.upstream }}-${{ matrix.ref }}
+          tag_name: kernel-${{ env.SHORT_SHA }}
           files: |
             ${{ github.workspace }}/out/*
           body: |
             | Name | Value |
             | ------------- | ------------- |
             | Builder | `ghcr.io/dfinity/kernel-builder:${{ env.BUILDER_REF }}` |
+            | Local | [${{ github.repository }}:${{ github.sha }}](https://github.com/${{ github.repository }})/tree/${{ github.sha }} |
             | Upstream | [`${{ matrix.upstream }}:${{ matrix.ref }}`](https://github.com/${{ matrix.upstream }}/tree/${{ matrix.ref }}) |
 
   ovmf:
@@ -166,17 +170,21 @@ jobs:
             ghcr.io/dfinity/ovmf-builder:${{ env.BUILDER_REF }} \
               bash /local/build/ovmf.sh
 
+      - name: Set short sha
+        run: echo "SHORT_SHA=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
+
       - name: Publish
         uses: softprops/action-gh-release@v1
         with:
           token: ${{ secrets.RELEASE_ACCESS_TOKEN }}
-          tag_name: ${{ matrix.upstream }}-${{ matrix.ref }}
+          tag_name: ovmf-${{ env.SHORT_SHA }}
           files: |
             ${{ github.workspace }}/out/OVMF.fd
           body: |
             | Name | Value |
             | ------------- | ------------- |
             | Builder | `ghcr.io/dfinity/ovmf-builder:${{ env.BUILDER_REF }}` |
+            | Local | [${{ github.repository }}:${{ github.sha }}](https://github.com/${{ github.repository }})/tree/${{ github.sha }} |
             | Upstream | [`${{ matrix.upstream }}:${{ matrix.ref }}`](https://github.com/${{ matrix.upstream }}/tree/${{ matrix.ref }}) |
 
   qemu:
@@ -225,15 +233,19 @@ jobs:
             ghcr.io/dfinity/qemu-builder:${{ env.BUILDER_REF }} \
               bash /local/build/qemu.sh
 
+      - name: Set short sha
+        run: echo "SHORT_SHA=$(git rev-parse --short ${{ github.sha }})" >> $GITHUB_ENV
+
       - name: Publish
         uses: softprops/action-gh-release@v1
         with:
           token: ${{ secrets.RELEASE_ACCESS_TOKEN }}
-          tag_name: ${{ matrix.upstream }}-${{ matrix.ref }}
+          tag_name: qemu-${{ env.SHORT_SHA }}
           files: |
             ${{ github.workspace }}/build/qemu_*.deb
           body: |
             | Name | Value |
             | ------------- | ------------- |
             | Builder | `ghcr.io/dfinity/qemu-builder:${{ env.BUILDER_REF }}` |
+            | Local | [${{ github.repository }}:${{ github.sha }}](https://github.com/${{ github.repository }})/tree/${{ github.sha }} |
             | Upstream | [`${{ matrix.upstream }}:${{ matrix.ref }}`](https://github.com/${{ matrix.upstream }}/tree/${{ matrix.ref }}) |
diff --git a/build/kernel.sh b/build/kernel.sh
@@ -22,7 +22,6 @@ make O=${BUILD_DIR} distclean
 
 # Configuration
 cp "${CONFIG_PATH}" "${BUILD_DIR}"
-${CONFIG_CMD} --set-str LOCALVERSION "${LOCALVERSION}"
 
 # Build and package
 make O=${BUILD_DIR} -j$(nproc) bindeb-pkg

diff --git a/cfg/.config b/cfg/.config
@@ -30,7 +30,7 @@ CONFIG_THREAD_INFO_IN_TASK=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 # CONFIG_COMPILE_TEST is not set
 # CONFIG_WERROR is not set
-CONFIG_LOCALVERSION="a38297e3fb01"
+CONFIG_LOCALVERSION=""
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_BUILD_SALT=""
 CONFIG_HAVE_KERNEL_GZIP=y