replace packages.txt with calculated graph

Signed-off-by: Avi Deitcher <avi@deitcher.net>

Author: deitch

.github/pull-request-template.md

@@ -32,7 +32,6 @@ addressed, and remove any items that are not relevant to this PR.
   - [ ] Alternatively, the PR is marked as related to a pre-existing package request bug, such as a dependency
 - [ ] REQUIRED - The package is available under an OSI-approved or FSF-approved license
 - [ ] REQUIRED - The version of the package is still receiving security updates
-- [ ] REQUIRED - The package is added to `packages.txt`
 
 #### For security-related PRs
 <!-- remove if unrelated -->

.github/workflows/ci-build.yaml

@@ -7,6 +7,8 @@ on:
     branches:
       - gh-readonly-queue/main/**
 
+env:
+  WOLFICTL: "docker run -it --rm --entrypoint=wolfictl ghcr.io/wolfi-dev/sdk:latest@sha256:b296d1848a8fb05ae08d41fbcfd3822ada50678f04d0ead2c4808b014b8e0d63 wolfictl"
 jobs:
   changes:
     name: Determine packages to test building
@@ -28,17 +30,13 @@ jobs:
       - name: Build package list
         id: package-list
         run: |
-          # Ensure there is a newline at the end of packages.txt to avoid `read` from ignoring
-          # the last entry.
-          echo >> $GITHUB_WORKSPACE/packages.txt
-
           printf "packages=" >> $GITHUB_OUTPUT
 
-          while read pkg; do
+          make list | while read pkg; do
             for file in ${{ steps.changes.outputs.all_changed_files }}; do
               [ "${file%.yaml}" = "$pkg" ] && printf "%s " ${file%.yaml} >> $GITHUB_OUTPUT
             done
-          done < $GITHUB_WORKSPACE/packages.txt
+          done
 
           printf "\n" >> $GITHUB_OUTPUT
 

CONTRIBUTING.md

@@ -26,12 +26,6 @@ Wolfi packages are built using melange. If you want to learn how packages are bu
 
 Start by cloning this repository and create a YAML file named `<your-package-name>.yaml` in its root directory. If you have any patches, create a folder with the same name and put them there.
 
-Add a new entry for your package near the bottom of [`packages.txt`](packages.txt) like this:
-
-```
-your-package-name
-```
-
 Once you're done writing the new package configuration file, you can test it by triggering a build with `make packages/<your-package-name> BUILDWORLD=no USE_CACHE=no`.
 
 note: `USE_CACHE=no` disables using a GCP cloud bucket for caching pipeline sources.  This is mainly used for production setups and not needed for local development.

Makefile

@@ -6,6 +6,7 @@ endif
 TARGETDIR = packages/${ARCH}
 
 MELANGE ?= $(shell which melange)
+WOLFICTL ?= $(shell which wolfictl)
 KEY ?= local-melange.rsa
 REPO ?= $(shell pwd)/packages
 CACHE_DIR ?= gs://wolfi-sources/
@@ -50,11 +51,8 @@ endif
 endef
 
 # The list of packages to be built. The order matters.
-# At some point, when ready, this should be replaced with `wolfictl text -t name .`
-# non-standard source directories are provided by adding them separated by a comma,
-# e.g.
-# postgres-11,postgres
-PKGLIST ?= $(shell cat packages.txt | grep -v '^\#' )
+# wolfictl determines the list and order
+PKGLIST ?= $(shell $(WOLFICTL) text --dir . --type name)
 
 all: ${KEY} .build-packages
 

bazel-5

@@ -0,0 +1 @@
+bazel

bazel-6

@@ -0,0 +1 @@
+bazel

lint.sh

@@ -6,12 +6,6 @@ makepkgs=$(make list-yaml)
 for f in *.yaml; do
   echo "---" $f
 
-  # Check that every package is listed in packages.txt
-  if ! echo "$makepkgs" | grep -wq "$f"; then
-    echo "missing $f in packages.txt"
-    exit 1
-  fi
-
   # Don't specify packages.wolfi.dev/os as a repository, and remove it from the keyring.
   # Packages from the bootstrap repo should be allowed, but otherwise packages
   # should be fetched locally and the local repository should be appended at

mariadb-10.11

@@ -0,0 +1 @@
+mariadb

mariadb-10.6

@@ -0,0 +1 @@
+mariadb