diff --git a/.github/workflows/build-iso-latest.yml b/.github/workflows/build-iso-latest.yml index 953cbd3d4a6..5e1b5525781 100644 --- a/.github/workflows/build-iso-latest.yml +++ b/.github/workflows/build-iso-latest.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - brand_name: ${{ fromJson(inputs.brand_name || '["bluefin", "aurora"]') }} + brand_name: ${{ fromJson(inputs.brand_name || '["bluefin"]') }} with: image_flavors: '["main", "nvidia", "hwe", "hwe-nvidia"]' brand_name: ${{ matrix.brand_name }} diff --git a/.github/workflows/build-iso-stable.yml b/.github/workflows/build-iso-stable.yml index 2212f08982c..416692125a8 100644 --- a/.github/workflows/build-iso-stable.yml +++ b/.github/workflows/build-iso-stable.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - brand_name: ${{ fromJson(inputs.brand_name || '["bluefin", "aurora"]') }} + brand_name: ${{ fromJson(inputs.brand_name || '["bluefin"]') }} with: brand_name: ${{ matrix.brand_name }} stream_name: stable diff --git a/.github/workflows/clean.yml b/.github/workflows/clean.yml index 98abb5e9959..2df2e538030 100644 --- a/.github/workflows/clean.yml +++ b/.github/workflows/clean.yml @@ -17,7 +17,7 @@ jobs: uses: dataaxiom/ghcr-cleanup-action@2d58aab3d24aed94070e032d3091b83d50d93534 # v1.0.15 with: token: ${{ secrets.GITHUB_TOKEN }} - packages: aurora,aurora-asus,aurora-asus-nvidia,aurora-dx,aurora-dx-asus,aurora-dx-hwe,aurora-dx-asus-nvidia,aurora-dx-hwe-nvidia,aurora-dx-nvidia,aurora-dx-surface,aurora-dx-surface-nvidia,aurora-hwe,aurora-hwe-nvidia,aurora-surface,aurora-nvidia,aurora-surface,aurora-surface-nvidia,bluefin,bluefin-asus-nvidia,bluefin-dx,bluefin-dx-asus-nvidia,bluefin-dx-hwe,bluefin-dx-hwe-nvidia,bluefin-dx-nvidia,bluefin-hwe,bluefin-nvidia + packages: bluefin,bluefin-asus-nvidia,bluefin-dx,bluefin-dx-asus-nvidia,bluefin-dx-hwe,bluefin-dx-hwe-nvidia,bluefin-dx-nvidia,bluefin-hwe,bluefin-nvidia older-than: 90 days delete-orphaned-images: true keep-n-tagged: 7 diff --git a/.github/workflows/reusable-build-iso.yml b/.github/workflows/reusable-build-iso.yml index 417f76516c8..be3684b5c00 100644 --- a/.github/workflows/reusable-build-iso.yml +++ b/.github/workflows/reusable-build-iso.yml @@ -7,8 +7,9 @@ on: default: "['main', 'nvidia']" type: string brand_name: - description: "The Brand Name: bluefin or aurora" + description: "The Brand Name: bluefin" required: true + default: bluefin type: string stream_name: description: "The Fedora Version: gts, stable, or latest" @@ -84,7 +85,7 @@ jobs: retention-days: 0 compression-level: 0 overwrite: true - + - name: HWE ISO rename if: contains(matrix.image_flavor, 'hwe') shell: bash @@ -116,19 +117,3 @@ jobs: sudo apt-get update sudo apt-get install -y rclone rclone copy $SOURCE_DIR R2:bluefin - - - name: Upload ISOs and Checksum to R2 to Aurora Bucket - if: github.ref_name == 'main' && contains(matrix.base_name,'aurora') - shell: bash - env: - RCLONE_CONFIG_R2_TYPE: s3 - RCLONE_CONFIG_R2_PROVIDER: Cloudflare - RCLONE_CONFIG_R2_ACCESS_KEY_ID: ${{ secrets.AURORA_R2_ACCESS_KEY_ID }} - RCLONE_CONFIG_R2_SECRET_ACCESS_KEY: ${{ secrets.AURORA_R2_SECRET_ACCESS_KEY }} - RCLONE_CONFIG_R2_REGION: auto - RCLONE_CONFIG_R2_ENDPOINT: ${{ secrets.AURORA_R2_ENDPOINT }} - SOURCE_DIR: ${{ steps.upload-directory.outputs.iso-upload-dir }} - run: | - sudo apt-get update - sudo apt-get install -y rclone - rclone copy $SOURCE_DIR R2:aurora-dl diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 5f8f983b0f9..619f52fd312 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -7,8 +7,9 @@ on: default: "['main', 'nvidia']" type: string brand_name: - description: "The Brand Name: bluefin or aurora" + description: "The Brand Name: bluefin" required: true + default: bluefin type: string stream_name: description: "The Fedora Version: gts, stable, or latest" diff --git a/boot_menu.yml b/boot_menu.yml index 3d0a267f60f..7ed86cdbffa 100644 --- a/boot_menu.yml +++ b/boot_menu.yml @@ -13,17 +13,3 @@ ublue_variants: flavors: - label: bluefin-nvidia info: Bluefin - - label: ublue-os/aurora - ks: /kickstart/ublue-os.ks - flavors: - - label: aurora - info: Aurora - - label: ublue-os/aurora-nvidia - ks: /kickstart/ublue-os-nvidia.ks - subvariants: - - label: latest driver - - label: 470xx driver - suffix: -470 - flavors: - - label: aurora-nvidia - info: Aurora