diff --git a/.github/workflows/pure.yml b/.github/workflows/pure.yml index 20c77d25..a2a31547 100644 --- a/.github/workflows/pure.yml +++ b/.github/workflows/pure.yml @@ -1,7 +1,6 @@ name: Ubuntu Pure Lunar -on: - workflow_dispatch +on: workflow_dispatch jobs: build: @@ -14,20 +13,52 @@ jobs: options: --privileged -it steps: - - uses: actions/checkout@v3 - - - name: De-bloat stock image - run: | - rm -r /run/host/usr/share/dotnet - rm -r /run/host${{ runner.tool_cache }} - - - name: Install needed packages - run: apt update && apt install debootstrap -y - - - name: Build ISO - run: ./build.sh etc/terraform.conf - - - uses: actions/upload-artifact@v3 - with: - name: Ubuntu Pure - path: builds/ + - uses: actions/checkout@v3 + + - name: De-bloat stock image + run: | + rm -r /run/host/usr/share/dotnet + rm -r /run/host${{ runner.tool_cache }} + + - name: Install needed packages + run: apt update && apt install debootstrap -y + + - name: Build ISO + run: ./build.sh etc/terraform.conf + + - uses: actions/upload-artifact@v3 + with: + name: Ubuntu Pure + path: builds/ + + - uses: "actions/github-script@v6" + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + script: | + try { + const response = await github.rest.repos.createRelease({ + draft: false, + generate_release_notes: true, + name: process.env.RELEASE_TAG, + owner: context.repo.owner, + prerelease: false, + repo: context.repo.repo, + tag_name: process.env.RELEASE_TAG, + }); + + core.exportVariable('RELEASE_ID', response.data.id); + core.exportVariable('RELEASE_UPLOAD_URL', response.data.upload_url); + } catch (error) { + core.setFailed(error.message); + } + + + - uses: actions/upload-release-asset@v1 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + with: + upload_url: ${{ steps.create_release.outputs.upload_url }} + asset_path: /builds + asset_name: Ubuntu Pure.zip + asset_content_type: application/gzip + diff --git a/build.sh b/build.sh index 7a46d3c6..f158e5ab 100755 --- a/build.sh +++ b/build.sh @@ -79,7 +79,7 @@ build () { YYYYMMDD="$(date +%Y%m%d)" OUTPUT_DIR="$BASE_DIR/builds/$BUILD_ARCH" mkdir -p "$OUTPUT_DIR" - FNAME="VanillaOS-$VERSION-$CHANNEL.$YYYYMMDD$OUTPUT_SUFFIX" + FNAME="Ubuntu-Pure-Remix-$VERSION-$CHANNEL.$YYYYMMDD$OUTPUT_SUFFIX" mv "$BASE_DIR/tmp/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso" # cd into output to so {FNAME}.sha256.txt only diff --git a/etc/config/hooks/live/004-set-os-info.chroot b/etc/config/hooks/live/004-set-os-info.chroot index 0529713c..7fc6bac5 100644 --- a/etc/config/hooks/live/004-set-os-info.chroot +++ b/etc/config/hooks/live/004-set-os-info.chroot @@ -16,7 +16,7 @@ VERSION_CODENAME="@CODENAME" ID=ubuntu ID_LIKE=debian HOME_URL="" -SUPPORT_URL=" +SUPPORT_URL="" BUG_REPORT_URL="" PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy" UBUNTU_CODENAME="@BASECODENAME"' > /etc/os-release diff --git a/etc/terraform.conf b/etc/terraform.conf index 544c1182..305eb61d 100644 --- a/etc/terraform.conf +++ b/etc/terraform.conf @@ -11,7 +11,7 @@ BASEVERSION="23.04" CODENAME="pure" # distribution version -VERSION="1.0" +VERSION="0.1" # distribution channel CHANNEL="all"