Skip to content

Commit

Permalink
refactor: remove bluefin references and update descriptions in workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
RealVishy committed Dec 10, 2024
1 parent fe9e348 commit 9be9b67
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-iso-stable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
strategy:
fail-fast: false
matrix:
brand_name: ${{ fromJson(inputs.brand_name || '["bluefin", "aurora"]') }}
brand_name: ${{ fromJson(inputs.brand_name || '["aurora"]') }}
with:
brand_name: ${{ matrix.brand_name }}
stream_name: stable
3 changes: 0 additions & 3 deletions .github/workflows/build-isos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ permissions:
id-token: write

jobs:
build-iso-gts:
uses: ./.github/workflows/build-iso-gts.yml
secrets: inherit
build-iso-stable:
uses: ./.github/workflows/build-iso-stable.yml
secrets: inherit
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/generate-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@ on:
workflow_call:
inputs:
stream_name:
description: "Release Tag (e.g. gts, stable)"
description: "Release Tag (e.g. stable, latest)"
type: string
required: true
workflow_dispatch:
inputs:
handwritten:
description: "Small Changelog about changes in this build"
stream_name:
description: "Release Tag (e.g. gts, stable)"
description: "Release Tag (e.g. stable, latest)"
required: true
type: choice
options:
Expand Down Expand Up @@ -60,7 +60,7 @@ jobs:
- name: Create Release
uses: softprops/action-gh-release@v2
if: contains(fromJson('["gts", "stable"]'), matrix.version) && (github.event.schedule == '45 5 * * 0' || contains(fromJson('["workflow_dispatch", "workflow_call"]'), github.event_name))
if: contains(fromJson('["stable"]'), matrix.version) && (github.event.schedule == '45 5 * * 0' || contains(fromJson('["workflow_dispatch", "workflow_call"]'), github.event_name))
with:
name: ${{ steps.generate-release-text.outputs.title }}
tag_name: ${{ steps.generate-release-text.outputs.tag }}
Expand Down
20 changes: 2 additions & 18 deletions .github/workflows/reusable-build-iso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
default: "['main', 'nvidia']"
type: string
brand_name:
description: "The Brand Name: bluefin or aurora"
description: "The Brand Name: aurora"
required: true
type: string
stream_name:
description: "The Fedora Version: gts, stable, or latest"
description: "The Fedora Version: stable, or latest"
required: true
type: string

Expand Down Expand Up @@ -101,22 +101,6 @@ jobs:
sed -i -e 's/-asus/-surface/' "${{ steps.upload-directory.outputs.iso-upload-dir}}/${surface_name}-CHECKSUM"
tree "${{ steps.upload-directory.outputs.iso-upload-dir }}"
- name: Upload ISOs and Checksum to R2 to Bluefin Bucket
if: github.ref_name == 'main' && contains(matrix.base_name,'bluefin')
shell: bash
env:
RCLONE_CONFIG_R2_TYPE: s3
RCLONE_CONFIG_R2_PROVIDER: Cloudflare
RCLONE_CONFIG_R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
RCLONE_CONFIG_R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
RCLONE_CONFIG_R2_REGION: auto
RCLONE_CONFIG_R2_ENDPOINT: ${{ secrets.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:bluefin
- name: Upload ISOs and Checksum to R2 to Aurora Bucket
if: github.ref_name == 'main' && contains(matrix.base_name,'aurora')
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/reusable-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ on:
default: "['main', 'nvidia']"
type: string
brand_name:
description: "The Brand Name: bluefin or aurora"
description: "The Brand Name: aurora"
required: true
type: string
stream_name:
description: "The Fedora Version: gts, stable, or latest"
description: "The Fedora Version: stable, or latest"
required: true
type: string
kernel_pin:
Expand Down

0 comments on commit 9be9b67

Please sign in to comment.