From 92f46ee3915b37f6aa13d5b1d187a06d08ead99d Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Sat, 30 Mar 2024 20:51:51 -0400 Subject: [PATCH] invalid reference --- .github/workflows/build_iso.yml | 110 -------------------------------- .github/workflows/tests.yml | 2 +- Makefile | 2 +- 3 files changed, 2 insertions(+), 112 deletions(-) diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml index 7003990..e5ee9ec 100644 --- a/.github/workflows/build_iso.yml +++ b/.github/workflows/build_iso.yml @@ -162,113 +162,3 @@ jobs: sha: ${{ env.sha }} targetUrl: ${{ steps.jobs.outputs.html_url }} - build_iso_no_flatpaks: - name: Build ISO without Flatpaks - env: - JOB_NAME: Build ISO without Flatpaks - runs-on: ubuntu-latest - needs: - - load_vars - permissions: - contents: read - statuses: write - continue-on-error: false - strategy: - fail-fast: false - matrix: - version: - - 38 - - 39 - - 40 - steps: - - name: Checkout - uses: actions/checkout@v4 - with: - submodules: recursive - - - name: Switch branch - if: inputs.pr - env: - GITHUB_USER: ${{ github.actor }} - GITHUB_TOKEN: ${{ github.token }} - run: | - sudo apt-get update - sudo apt-get install -y hub - hub pr checkout ${{ inputs.pr }} - echo "sha=$(git rev-parse HEAD)" >> $GITHUB_ENV - - - name: Get Current Job Log URL - if: inputs.pr && always() - uses: Tiryoh/gha-jobid-action@v1 - id: jobs - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - job_name: "${{ inputs.parent_job_name }} / ${{ env.JOB_NAME }} (${{ matrix.version }})" - - - name: Set status - if: inputs.pr && always() - uses: myrotvorets/set-commit-status-action@v2.0.1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - status: pending - context: ${{ env.JOB_NAME }} (${{ matrix.version }}) - sha: ${{ env.sha }} - targetUrl: ${{ steps.jobs.outputs.html_url }} - - - name: Free Disk Space (Ubuntu) - uses: jlumbroso/free-disk-space@main - with: - # this might remove tools that are actually needed, - # if set to "true" but frees about 6 GB - tool-cache: false - - # all of these default to true, but feel free to set to - # "false" if necessary for your workflow - android: true - dotnet: true - haskell: true - large-packages: true - docker-images: true - swap-storage: true - - - name: Lowercase Registry - id: registry_case - uses: ASzc/change-string-case-action@v6 - with: - string: ${{ needs.load_vars.outputs.IMAGE_REPO }} - - - name: Get image version - id: meta - uses: docker/metadata-action@v5 - with: - tags: | - type=ref,event=branch - type=ref,event=pr - - - name: Login to Registry - run: | - echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin - - - name: Build ISO - uses: ./ - id: build - with: - arch: ${{ needs.load_vars.outputs.ARCH }} - image_name: ${{ needs.load_vars.outputs.IMAGE_NAME }} - image_repo: ${{ needs.load_vars.outputs.IMAGE_REPO }} - image_tag: ${{ matrix.version }} - version: ${{ matrix.version }} - variant: ${{ needs.load_vars.outputs.VARIANT }} - secure_boot_key_url: ${{ needs.load_vars.outputs.SECURE_BOOT_KEY_URL }} - enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }} - iso_name: build/${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso - - - name: Set status - if: inputs.pr && always() - uses: myrotvorets/set-commit-status-action@v2.0.1 - with: - token: ${{ secrets.GITHUB_TOKEN }} - status: ${{ job.status }} - context: ${{ env.JOB_NAME }} (${{ matrix.version }}) - sha: ${{ env.sha }} - targetUrl: ${{ steps.jobs.outputs.html_url }} diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index fa13915..fb89fa4 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -42,7 +42,7 @@ jobs: flatpaks_refs_dir: /github/workspace/flatpak_refs build_iso_no_flatpaks: - name: Build ISO with Flatpaks Refs + name: Build ISO without Flatpaks needs: - build_container uses: ./.github/workflows/build_iso.yml diff --git a/Makefile b/Makefile index 5717ee5..aeaaf14 100644 --- a/Makefile +++ b/Makefile @@ -70,7 +70,7 @@ _SUBDIRS = container external flatpak_refs lorax_templates repos xorriso test # Create checksum ## Default action -$(ISO_NAME)-CHECKSUM: build/$(ISO_NAME) +$(ISO_NAME)-CHECKSUM: $(ISO_NAME) cd build && sha256sum $(notdir $(ISO_NAME)) > $(ISO_NAME)-CHECKSUM # Build end ISO