Fix release pipeline: bakery.toml discovery and ECOSYSTEM_DIR on hestia
- Add bakery.toml describing the bakery binary as an installable product - gen-index.sh: check DL_DIR/<pkg>/bakery.toml first (written by each product's release workflow), fall back to sibling checkout for local dev - gen-index.sh: include bakery itself in the products list - release.yml: use GITHUB_WORKSPACE instead of ECOSYSTEM_DIR (the bread-ecosystem runner IS the checkout, no separate clone needed) - release.yml: copy bakery.toml to DL_DIR during artifact prep
This commit is contained in:
parent
257619447a
commit
57ddbab262
3 changed files with 21 additions and 7 deletions
10
.github/workflows/release.yml
vendored
10
.github/workflows/release.yml
vendored
|
|
@ -6,7 +6,6 @@ on:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
DL_DIR: /srv/breadway-dl
|
DL_DIR: /srv/breadway-dl
|
||||||
ECOSYSTEM_DIR: /home/breadway/Projects/bread-ecosystem
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
@ -15,7 +14,10 @@ jobs:
|
||||||
- uses: actions/checkout@v4
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: build
|
- name: build
|
||||||
run: cargo build --release --locked
|
run: cargo build --release --locked -p bakery
|
||||||
|
|
||||||
|
- name: test
|
||||||
|
run: cargo test --locked --workspace
|
||||||
|
|
||||||
- name: prepare artifacts
|
- name: prepare artifacts
|
||||||
run: |
|
run: |
|
||||||
|
|
@ -28,11 +30,11 @@ jobs:
|
||||||
sha256sum "${PKG_DIR}/bakery-x86_64" | awk '{print $1}' \
|
sha256sum "${PKG_DIR}/bakery-x86_64" | awk '{print $1}' \
|
||||||
> "${PKG_DIR}/bakery-x86_64.sha256"
|
> "${PKG_DIR}/bakery-x86_64.sha256"
|
||||||
|
|
||||||
# Update the 'latest' symlink.
|
cp bakery.toml "${PKG_DIR}/bakery.toml"
|
||||||
ln -sfn "${PKG_DIR}" "${DL_DIR}/bakery/latest"
|
ln -sfn "${PKG_DIR}" "${DL_DIR}/bakery/latest"
|
||||||
|
|
||||||
- name: regenerate index.json
|
- name: regenerate index.json
|
||||||
run: bash "${ECOSYSTEM_DIR}/scripts/gen-index.sh"
|
run: bash "${GITHUB_WORKSPACE}/scripts/gen-index.sh"
|
||||||
|
|
||||||
- name: upload to GitHub Release
|
- name: upload to GitHub Release
|
||||||
env:
|
env:
|
||||||
|
|
|
||||||
8
bakery.toml
Normal file
8
bakery.toml
Normal file
|
|
@ -0,0 +1,8 @@
|
||||||
|
name = "bakery"
|
||||||
|
description = "Bread ecosystem package manager"
|
||||||
|
binaries = ["bakery"]
|
||||||
|
system_deps = []
|
||||||
|
bread_deps = []
|
||||||
|
|
||||||
|
[install]
|
||||||
|
post_install = []
|
||||||
|
|
@ -16,6 +16,7 @@ OUT="${DL_DIR}/index.json"
|
||||||
|
|
||||||
# Products are read from the registry. Each line is "name repo".
|
# Products are read from the registry. Each line is "name repo".
|
||||||
products=(
|
products=(
|
||||||
|
"bakery Breadway/bread-ecosystem"
|
||||||
"bread Breadway/bread"
|
"bread Breadway/bread"
|
||||||
"breadbar Breadway/breadbar"
|
"breadbar Breadway/breadbar"
|
||||||
"breadbox Breadway/breadbox"
|
"breadbox Breadway/breadbox"
|
||||||
|
|
@ -72,9 +73,12 @@ build_package_json() {
|
||||||
binaries_json="$(jq -n --argjson arr "${binaries_json}" --argjson e "${entry}" '$arr + [$e]')"
|
binaries_json="$(jq -n --argjson arr "${binaries_json}" --argjson e "${entry}" '$arr + [$e]')"
|
||||||
done
|
done
|
||||||
|
|
||||||
# Read bakery.toml for this product from a co-located checkout if available,
|
# Read bakery.toml: the release workflow copies it to DL_DIR alongside the
|
||||||
# else use minimal defaults.
|
# binaries; fall back to a sibling checkout for local dev use.
|
||||||
local bakery_toml="${SCRIPT_DIR}/../${name}/bakery.toml"
|
local bakery_toml="${DL_DIR}/${name}/bakery.toml"
|
||||||
|
if [[ ! -f "${bakery_toml}" ]]; then
|
||||||
|
bakery_toml="${SCRIPT_DIR}/../${name}/bakery.toml"
|
||||||
|
fi
|
||||||
local description=""
|
local description=""
|
||||||
local system_deps="[]"
|
local system_deps="[]"
|
||||||
local bread_deps="[]"
|
local bread_deps="[]"
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue