Skip to content

Commit

Permalink
✨ release 4.2 to current
Browse files Browse the repository at this point in the history
  • Loading branch information
electricduck committed May 29, 2023
2 parents d12ca9b + 9d5774c commit 0c947fe
Show file tree
Hide file tree
Showing 11 changed files with 144 additions and 177 deletions.
58 changes: 0 additions & 58 deletions .ci.sh

This file was deleted.

53 changes: 53 additions & 0 deletions .github/actions/ci/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: CI
inputs:
branch:
type: string
container_image:
required: false
type: string
dry_run:
required: false
type: boolean
tree:
required: true
type: string
runs:
using: "composite"
steps:
- if: ${{ inputs.branch != '' }}
run: git checkout ${{ inputs.branch }}
shell: bash
- run: git fetch --tags origin
shell: bash
- run: git submodule sync
shell: bash
- run: git submodule update --init --recursive
shell: bash
- run: |
function test_input() {
[[ "$1" != "" ]] && echo "$1" || echo "$2"
}
start_time="$(date +%s)"
if [[ "${{ inputs.dry_run }}" != "" ]]; then
working_dir="/tmp/sodalite-build-$start_time"
./build.sh \
--container \
--tree "${{ inputs.tree }}" \
--vendor "sodaliterocks" \
--working-dir "$working_dir" \
--ex-container-hostname "$(hostname -f)" \
--ex-container-image "$(test_input "${{ inputs.container_image }}" "fedora:37")" \
--ex-override-starttime "$start_time"
rm -rf "$working_dir"
else
./build.sh \
--container \
--tree "${{ inputs.tree }}" \
--vendor "sodaliterocks" \
--working-dir "/srv/store/variable/ostree" \
--ex-container-hostname "$(hostname -f)" \
--ex-container-image "$(test_input "${{ inputs.container_image }}" "fedora:37")" \
--ex-override-starttime "$start_time" \
--ex-print-github-release-table-row
fi
shell: bash
31 changes: 0 additions & 31 deletions .github/workflows/ci.yml

This file was deleted.

24 changes: 0 additions & 24 deletions .github/workflows/update-manual.yml

This file was deleted.

63 changes: 0 additions & 63 deletions .github/workflows/update-scheduled.yml

This file was deleted.

41 changes: 41 additions & 0 deletions .github/workflows/update.manual.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: Update (Manual)

on:
workflow_dispatch:
inputs:
tree:
default: desktop
description: "Tree"
required: true
type: choice
options:
- desktop
- desktop-budgie
- desktop-deepin
- desktop-gnome
dry_run:
default: false
description: "Dry Run"
type: boolean
container_image:
default: fedora:37
description: "Container Image"
required: true
type: choice
options:
- "fedora:latest"
- "fedora:36"
- "fedora:37"
- "fedora:38"
- "fedora:39"
- "fedora:rawhide"

jobs:
custom:
name: "Custom"
runs-on: self-hosted
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci
with:
tree: ${{ inputs.tree }}
16 changes: 16 additions & 0 deletions .github/workflows/update.scheduled.current.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "Update: Current"

on:
schedule:
- cron: '0 4 * * 3,6' # At 04:00 on Wednesday and Saturday

jobs:
desktop:
name: "Desktop"
runs-on: self-hosted
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci
with:
branch: release/current
tree: desktop
16 changes: 16 additions & 0 deletions .github/workflows/update.scheduled.long-4.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "Update: Long (4)"

on:
schedule:
- cron: '0 4 * * 3,6' # At 04:00 on Wednesday and Saturday

jobs:
desktop:
name: "Desktop"
runs-on: self-hosted
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci
with:
branch: release/long/4
tree: desktop
16 changes: 16 additions & 0 deletions .github/workflows/update.scheduled.next.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: "Update: Next"

on:
schedule:
- cron: '0 4 * * 3,6' # At 04:00 on Wednesday and Saturday

jobs:
desktop:
name: "Desktop"
runs-on: self-hosted
steps:
- uses: actions/checkout@v3
- uses: ./.github/actions/ci
with:
branch: release/next
tree: desktop
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -470,6 +470,7 @@ function main() {
[[ $ex_ntfy_password != "" ]] && container_build_args+=" --ex-ntfy-password $ex_ntfy_password"
[[ $ex_ntfy_topic != "" ]] && container_build_args+=" --ex-ntfy-topic $ex_ntfy_topic"
[[ $ex_ntfy_username != "" ]] && container_build_args+=" --ex-ntfy-username $ex_ntfy_username"
[[ $ex_print_github_release_table_row != "" ]] && container_build_args+=" --ex-print-github-release-table-row $ex_print_github_release_table_row"
[[ $skip_cleanup != "" ]] && container_build_args+=" --skip-cleanup $skip_cleanup"
[[ $skip_test != "" ]] && container_build_args+=" --skip-test $skip_test"
[[ $tree != "" ]] && container_build_args+=" --tree $tree"
Expand Down
2 changes: 1 addition & 1 deletion src/cores/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include: [
]

releasever: "37"
automatic-version-prefix: "4.1-<date:%y%j>"
automatic-version-prefix: "4.2-<date:%y%j>"
automatic-version-suffix: "."
mutate-os-release: "${releasever}"

Expand Down

0 comments on commit 0c947fe

Please sign in to comment.