Skip to content
This repository has been archived by the owner on Apr 22, 2024. It is now read-only.

fix: General Fixes #7

Merged
merged 25 commits into from
Feb 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-existing-dockerfile
{
"name": "Existing Dockerfile",
// "build": {
// "context": "..",
// "dockerfile": "../Containerfile",
// "args": {
// "version": "39"
// }
// },
"image": "ghcr.io/ublue-os/isogenerator:latest",
"overrideCommand": true,
"shutdownAction": "stopContainer",
"privileged": true
}
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Default owner of code within this repo
* @JasonN3
52 changes: 52 additions & 0 deletions .github/workflows/build-container-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
---
name: Build Container Image
on:
pull_request:
branches:
- main
push:
branches:
- main

jobs:
push-image:
name: Build and push container image
runs-on: ubuntu-22.04
permissions:
contents: read
packages: write
strategy:
fail-fast: false
matrix:
version:
- 38
- 39
- 40
include:
- version: 39
support: latest
steps:
- name: Build image
uses: ublue-os/build-action@1.0.1
with:
image_name: isogenerator
image_variant: main
version: ${{ matrix.version }}
support: ${{ matrix.support }}
signing_key: ${{ secrets.SIGNING_SECRET }}
continue-on-error: false

check:
name: Check build successful
if: ${{ !cancelled() }}
runs-on: ubuntu-latest
needs:
- push-image
steps:
- name: Exit on failure for main
if: ${{ needs.push-image.result == 'failure' || needs.push-image.result == 'skipped' }}
shell: bash
run: exit 1
- name: Exit
shell: bash
run: exit 0
87 changes: 0 additions & 87 deletions .github/workflows/iso.yml

This file was deleted.

84 changes: 0 additions & 84 deletions .github/workflows/isogenerator-image.yml

This file was deleted.

58 changes: 58 additions & 0 deletions .github/workflows/test-iso.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: Test Generate ISO

on:
merge_group:
pull_request:
branches:
- main
paths-ignore:
- 'Containerfile'
- '*.md'
- 'LICENSE'
- 'CODEOWNERS'

jobs:
build-and-push-iso:
name: Build ISO
runs-on: ubuntu-latest
container:
image: fedora:39
options: "--privileged"
permissions:
contents: read
packages: write
strategy:
fail-fast: false
matrix:
version:
- 38
- 39
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Build ISO
uses: ./
with:
ARCH: 'x86_64'
IMAGE_NAME: 'base-main'
IMAGE_REPO: 'ghcr.io/ublue-os'
VARIANT: 'Kinoite'
EyeCantCU marked this conversation as resolved.
Show resolved Hide resolved
VERSION: ${{ matrix.version }}
ACTION_REPO: ${{ github.repository }}
ACTION_REF: ${{ github.ref }}

check:
name: Check build successful
if: ${{ !cancelled() }}
runs-on: ubuntu-latest
needs:
- build-and-push-iso
steps:
- name: Exit on failure for main
if: ${{ needs.build-and-push-iso.result == 'failure' || needs.build-and-push-iso.result == 'skipped' }}
shell: bash
run: exit 1
- name: Exit
shell: bash
run: exit 0
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
/original-pkgsizes.txt
/final-pkgsizes.txt
/lorax.conf
/*.iso
/output
/*.log
21 changes: 21 additions & 0 deletions Containerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
ARG VERSION=39

FROM fedora:${VERSION}

ENV ARCH="x86_64"
ENV IMAGE_NAME="base-main"
ENV IMAGE_REPO="ghcr.io/ublue-os"
ENV IMAGE_TAG="${VERSION}"
ENV VARIANT="Kinoite"
ENV VERSION="${VERSION}"
ENV WEB_UI="false"

COPY / /isogenerator
WORKDIR /isogenerator

RUN dnf install -y make && make install-deps

VOLUME /isogenerator/output

ENTRYPOINT ["make", "output/${IMAGE_NAME}-${IMAGE_TAG}.iso"]
CMD [ "ARCH=${ARCH}", "VERSION=${VERSION}", "IMAGE_REPO=${IMAGE_REPO}", "IMAGE_NAME=${IMAGE_NAME}", "IMAGE_TAG=${IMAGE_TAG}", "VARIANT=${VARIANT}", "WEB_UI=${WEB_UI}"]
18 changes: 0 additions & 18 deletions Dockerfile

This file was deleted.

Loading
Loading