Skip to content

Commit

Permalink
Revert "ci: fix publish path"
Browse files Browse the repository at this point in the history
This reverts commit 4d9dee5.
  • Loading branch information
hallyn committed Nov 21, 2023
1 parent 4d9dee5 commit 8b59dde
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 24 deletions.
23 changes: 13 additions & 10 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ jobs:
name: build
runs-on: self-hosted
steps:
env:
USERNAME: ${{ secrets.ZOTHUB_USERNAME }}
PASSWORD: ${{ secrets.ZOTHUB_PASSWORD }}
- name: Set up environment
run: |
mkdir ~/bin
Expand Down Expand Up @@ -74,13 +71,19 @@ jobs:
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
- name: publish provision and install layer
if: startsWith(github.ref, 'refs/tags/')
run: |
make publish
env:
ZOT_VERSION=2.0.0-rc5
ROOTFS_VERSION=v0.0.17.231018
TOPDIR=${{ env.TOPDIR }}
URL=docker://zothub.io/machine/bootkit
uses: project-stacker/stacker-build-push-action@main
with:
version: v1.0.0-rc8
file: 'layers/stacker.yaml'
build-args: |
ZOT_VERSION=2.0.0-rc5
ROOTFS_VERSION=v0.0.17.231018
TOPDIR=${{ env.TOPDIR }}
url: docker://zothub.io/machine/bootkit
layer-type: squashfs
tags: ${{ env.RELEASE_VERSION }}
username: ${{ secrets.ZOTHUB_USERNAME }}
password: ${{ secrets.ZOTHUB_PASSWORD }}

build_arm64:
runs-on: ubuntu-latest
Expand Down
17 changes: 3 additions & 14 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ ORAS := $(TOOLSDIR)/bin/oras
ORAS_VERSION := 1.0.0-rc.1
REGCTL := $(TOOLSDIR)/bin/regctl
REGCTL_VERSION := 0.5.0
STACKER := $(TOOLSDIR)/bin/stacker
STACKER_VERSION := v1.0.0-rc8
TOPDIR := $(shell git rev-parse --show-toplevel)
#BOOTKIT_VERSION ?= "v0.0.17.231018"
# We need a bootkit with new mosctl which knows about the new network.
Expand Down Expand Up @@ -67,11 +65,6 @@ $(REGCTL):
curl -Lo $(REGCTL) https://github.com/regclient/regclient/releases/download/v$(REGCTL_VERSION)/regctl-linux-$(arch)
chmod +x $(REGCTL)

$(STACKER):
mkdir -p $(TOOLSDIR)/bin
curl -Lo $(STACKER) https://github.com/project-stacker/stacker/releases/download/$(STACKER_VERSION)/stacker
chmod +x $(STACKER)

.PHONY: gofmt
gofmt: .made-gofmt

Expand All @@ -91,13 +84,9 @@ STACKER_SUBS = \
STACKER_OPTS = --layer-type=squashfs $(STACKER_SUBS)

.PHONY: layers
layers: mosctl $(STACKER)
$(STACKER) build $(STACKER_OPTS) --stacker-file layers/provision/stacker.yaml
$(STACKER) build $(STACKER_OPTS) --stacker-file layers/install/stacker.yaml

.PHONY: publish
publish: layers
$(STACKER) publish $(STACKER_OPTS) --stacker-file layers/provision/stacker.yaml --url $(URL) --username $(USERNAME) --password $(PASSWORD)
layers: mosctl
stacker build $(STACKER_OPTS) --stacker-file layers/provision/stacker.yaml
stacker build $(STACKER_OPTS) --stacker-file layers/install/stacker.yaml

.PHONY: test
test: deps
Expand Down

0 comments on commit 8b59dde

Please sign in to comment.