Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor!: Remove 'staging/stable' and move to 'main' #1835

Draft
wants to merge 1 commit into
base: staging
Choose a base branch
from
Draft
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
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:

Please only use this form to submit problems with building Kraftkit or it's interaction with Unikraft unikernels. This includes unexpected or undefined behavior, stacktraces, critical messages, and things just breaking or exploding.

**Ensure you have tested against the latest changes on `staging` branch before submitting this form.**
**Ensure you have tested against the latest changes on `main` branch before submitting this form.**

For questions, concerns or help with running Kraftkit, please check out our additional resources:

Expand Down
6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ updates:

- package-ecosystem: gomod
directory: /
target-branch: staging
target-branch: main
schedule:
interval: weekly
day: sunday
Expand All @@ -19,7 +19,7 @@ updates:
- nderjung
- package-ecosystem: gomod
directory: /tools/go-generate-qemu-devices
target-branch: staging
target-branch: main
schedule:
interval: weekly
day: sunday
Expand All @@ -34,7 +34,7 @@ updates:
- nderjung
- package-ecosystem: gomod
directory: /tools/protoc-gen-go-netconn
target-branch: staging
target-branch: main
schedule:
interval: weekly
day: sunday
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/actionlint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: actionlint
on:
pull_request:
types: [opened, synchronize, reopened]
branches: [staging]
branches: [main]
paths:
- '.github/workflows/**'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: build
on:
pull_request:
types: [opened, synchronize, reopened]
branches: [staging]
branches: [main]
paths:
- '**'
- '!.github/**'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/buildenvs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [released]
pull_request:
types: [opened, synchronize, reopened]
branches: [staging]
branches: [main]
paths:
- 'buildenvs/qemu.Dockerfile'
- 'buildenvs/myself.Dockerfile'
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
- uses: actions/checkout@v4
if: ${{ steps.check-run.outputs.run == 'true' && github.event_name == 'push' }}
with:
ref: stable
ref: main
fetch-depth: 0

- uses: actions/checkout@v4
Expand Down Expand Up @@ -207,7 +207,7 @@ jobs:
- uses: actions/checkout@v4
if: ${{ steps.check-run.outputs.run == 'true' && github.event_name == 'push' }}
with:
ref: stable
ref: main
fetch-depth: 0

- uses: actions/checkout@v4
Expand Down Expand Up @@ -407,7 +407,7 @@ jobs:
- uses: actions/checkout@v4
if: ${{ steps.check-run.outputs.run == 'true' && github.event_name == 'push' }}
with:
ref: stable
ref: main
fetch-depth: 0

- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: check/pr
on:
pull_request:
types: [opened, synchronize, reopened]
branches: [staging]
branches: [main]

jobs:
commits:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/check-static.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: check/static

on:
push:
branches: [stable]
release:
types: [released]
pull_request:
types: [opened, synchronize, reopened]
branches: [staging]
branches: [main]
paths:
- '**'
- '!.github/**'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/chore-expire-action-caches.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: chore/expire-action-caches

on:
push:
branches: [stable]
release:
types: [released]

jobs:

Expand Down Expand Up @@ -34,7 +34,7 @@ jobs:
})
.then(caches => {
for (const cache of caches) {
if (cache.ref == 'refs/heads/staging') {
if (cache.ref == 'refs/heads/main') {
const cachePrefix = cache.key.slice(0, -cacheSuffixLen)
if (cachePrefixes.has(cachePrefix)) {
const seen = cachePrefixes.get(cachePrefix)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/notarization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
uses: actions/checkout@v4
with:
repository: unikraft/homebrew-cli
ref: staging
ref: main
path: homebrew-kraftkit

- name: Update Brew Formula
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: release/staging
name: prerelease

on:
push:
branches: [staging]
branches: [main]

permissions:
contents: write
Expand All @@ -23,10 +23,10 @@ jobs:
run: |
git config --global --add safe.directory /__w/kraftkit/kraftkit
git fetch --force --tags

- name: Generate GoReleaser configuration
run: |
ytt -f .goreleaser-staging.yaml > goreleaser-staging.yaml
ytt -f .goreleaser-prerelease.yaml > goreleaser-prerelease.yaml

- name: Run GoReleaser
run: |
Expand All @@ -36,10 +36,10 @@ jobs:
git tag -a "$(git describe)" -m "Pre-release: $(git describe)"
echo "$GOOGLE_APPLICATION_JSON" > /tmp/gs.json
goreleaser build \
--config goreleaser-staging.yaml \
--config goreleaser-prerelease.yaml \
--skip-validate
goreleaser release \
--config goreleaser-staging.yaml \
--config goreleaser-prerelease.yaml \
--rm-dist \
--skip-validate
env:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: release/stable
name: release

on:
push:
Expand Down Expand Up @@ -33,7 +33,7 @@ jobs:

- name: Generate GoReleaser configuration
run: |
ytt -f .goreleaser-stable.yaml > goreleaser-stable.yaml
ytt -f .goreleaser-release.yaml > goreleaser-release.yaml

- name: Write cosign key to file
run: |
Expand All @@ -49,7 +49,7 @@ jobs:
export GORELEASER_CURRENT_TAG="${{ github.ref_name }}"
echo "$GOOGLE_APPLICATION_JSON" > /tmp/gs.json
goreleaser release \
--config goreleaser-stable.yaml \
--config goreleaser-release.yaml \
--clean \
--skip-validate
fury push "$(ls ./dist/kraftkit_*_linux_amd64.deb)" --quiet --account "$FURY_USER" --api-token "$FURY_TOKEN"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: tests/stable
name: tests/main

on:
push:
branches: [stable]
branches: [main]

jobs:
unit:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: tests
name: tests/pr

on:
pull_request:
types: [opened, synchronize, reopened]
branches: [staging]
branches: [main]
paths:
- '**'
- '!.github/**'
- '.github/workflows/tests.yaml'
- '.github/workflows/tests-pr.yaml'

jobs:
unit:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tools-dockerfile-llb-frontend.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: tools/dockerfile-llb-frontend

on:
push:
branches: [stable]
release:
types: [released]
pull_request:
types: [opened, synchronize, reopened]
branches: [staging]
branches: [main]
paths:
- 'tools/dockerfile-llb-frontend/**'
- '.github/workflows/dockerfile-llb-frontend.yaml'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tools-go-generate-qemu-device.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: tools/go-generate-qemu-device

on:
push:
branches: [stable]
release:
types: [released]
pull_request:
types: [opened, synchronize, reopened]
branches: [staging]
branches: [main]
paths:
- 'tools/go-generate-qemu-devices/**'
- '.github/workflows/gobuild-qemu-devices.yaml'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/tools-protoc-gen-go-netconn.yaml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
name: tools/protoc-gen-go-netconn

on:
push:
branches: [stable]
release:
types: [released]
pull_request:
types: [opened, synchronize, reopened]
branches: [staging]
branches: [main]
paths:
- 'tools/protoc-gen-go-netconn/**'
- '.github/workflows/gobuild-protoc.yaml'
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion .goreleaser-stable.yaml → .goreleaser-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ release:
header: |
## KraftKit {{ .Tag }} ({{ .Date }})

This is a stable release of kraftkit.
Release of kraftkit.
name_template: 'v{{ .Version }}'

signs:
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ endif
all: help

.PHONY: build
build: CHANNEL ?= staging
build: CHANNEL ?= prerelease
build: $(WORKDIR)/goreleaser-$(CHANNEL).yaml
build: ## Build all KraftKit binary artifacts.
$(GORELEASER) build --config $(WORKDIR)/goreleaser-$(CHANNEL).yaml --clean --skip-validate

$(WORKDIR)/goreleaser-$(CHANNEL).yaml: CHANNEL ?= staging
$(WORKDIR)/goreleaser-$(CHANNEL).yaml: CHANNEL ?= prerelease
$(WORKDIR)/goreleaser-$(CHANNEL).yaml:
$(YTT) -f .goreleaser-$(CHANNEL).yaml > goreleaser-$(CHANNEL).yaml

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Find [more examples and applications in our community catalog](https://github.co

## Use in GitHub Actions

KraftKit can be used to automatically build your application into a unikernel in a GitHub Actions workflow, simply `use` `unikraft/kraftkit@staging`.
KraftKit can be used to automatically build your application into a unikernel in a GitHub Actions workflow, simply `use` `unikraft/kraftkit@main`.

In the following example, a repository that has been initialized with a top-level `Kraftfile` that contains a target for qemu/x86_64 will be built every time a PR is opened, synchronized or re-opened:

Expand All @@ -103,7 +103,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- uses: unikraft/kraftkit@staging
- uses: unikraft/kraftkit@main
with:
workdir: .
kraftfile: Kraftfile
Expand Down