Fix #42 (#55)

* Fix --arch-name

* Use ubuntu 24.04

* Version bump

Author: Eeems

.github/workflows/build.yml

@@ -10,7 +10,7 @@ permissions: read-all
 jobs:
   format:
     name: Check formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -27,7 +27,7 @@ jobs:
         run: make format
   lint:
     name: Check for erroneous constructs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -44,7 +44,7 @@ jobs:
         run: make lint
   links:
     name: Check Markdown links
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout the Git repository
         uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
           make links
   test:
     name: Run tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
       matrix:
@@ -75,7 +75,7 @@ jobs:
         run: make test
   build:
     name: Make pip packages
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [format, lint, test]
     steps:
       - name: Checkout the Git repository
@@ -94,7 +94,7 @@ jobs:
           if-no-files-found: error
   standalone:
     name: Make Standalone
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [format, lint, test]
     steps:
       - name: Checkout the Git repository
@@ -115,7 +115,7 @@ jobs:
           if-no-files-found: error
   publish:
     name: Publish to PyPi
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     needs: [build, links]
     if: github.repository == 'toltec-dev/build' && github.event_name == 'release' && startsWith(github.ref, 'refs/tags')
     permissions:

Makefile

@@ -58,7 +58,8 @@ standalone: .venv-build/bin/activate
 
 test: .venv-runtime/bin/activate
 	. .venv-runtime/bin/activate; \
-	python -m unittest
+	python -m unittest; \
+	tests/foobar/test.sh
 
 format: .venv-build/bin/activate
 	. .venv-build/bin/activate; \

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "toltecmk"
-version = "0.3.3"
+version = "0.3.4"
 authors = [
   { name="Mattéo Delabre", email="git.matteo@delab.re" },
   { name="Eeems", email="eeems@eeems.email" },

tests/foobar/package

@@ -0,0 +1,33 @@
+#!/usr/bin/env bash
+# Copyright (c) 2023 The Toltec Contributors
+# SPDX-License-Identifier: MIT
+
+archs=(rm1 rm2 rmall)
+pkgnames=(foo bar)
+url=https://toltec-dev.org/
+pkgver=0.0.0-1
+timestamp=2023-12-23T20:46:51Z
+section="utils"
+maintainer="Eeems <eeems@eeems.email>"
+license=MIT
+image=base:v3.1
+source=()
+sha256sums=()
+
+build() {
+    true
+}
+
+foo() {
+    pkgdesc="Foo"
+    package() {
+        true
+    }
+}
+bar() {
+    pkgdesc="Bar"
+    package() {
+        true
+    }
+}
+

tests/foobar/test.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+set -e
+
+exists() {
+  if ! [ -f "$1" ]; then
+    echo "Error: Missing ${1}"
+    return 1
+  fi
+}
+missing() {
+  if [ -f "$1" ]; then
+    echo "Error: Found ${1}"
+    return 1
+  fi
+}
+
+tmpdir=$(mktemp -d)
+cleanup(){
+  rm -rf "$tmpdir"
+}
+trap cleanup EXIT
+
+python -m toltec \
+  --verbose \
+  --work-dir "$tmpdir/work" \
+  --dist-dir "$tmpdir/dist" \
+  --arch-name rmall \
+  $(dirname $0)
+
+tree $tmpdir/dist
+exists $tmpdir/dist/rmall/foo_0.0.0-1_rmall.ipk
+missing $tmpdir/dist/rm1/foo_0.0.0-1_rm1.ipk
+missing $tmpdir/dist/rm2/foo_0.0.0-1_rm2.ipk
+exists $tmpdir/dist/rmall/bar_0.0.0-1_rmall.ipk
+missing $tmpdir/dist/rm1/bar_0.0.0-1_rm1.ipk
+missing $tmpdir/dist/rm2/bar_0.0.0-1_rm2.ipk

toltec/__main__.py

@@ -103,6 +103,9 @@ def main() -> int:  # pylint:disable=too-many-branches
             build_matrix = {}
 
             for arch, recipes in recipe_bundle.items():
+                if args.arch_name and arch not in args.arch_name:
+                    continue
+
                 if args.package_name:
                     build_matrix[arch] = [
                         recipes.packages[pkg_name]