diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index 27ea41c..1f0b622 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -17,6 +17,8 @@ on: type: boolean default: false +run-name: Build all packages + concurrency: group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} cancel-in-progress: true @@ -52,6 +54,7 @@ jobs: run: python scripts/list_package_references.py env: GITHUB_CONTEXT: ${{ toJson(github) }} + GITHUB_INPUT: ${{ toJson(inputs) }} build: if: ${{ needs.generate-matrix.outputs.packages != '[]' && needs.generate-matrix.outputs.packages != '' }} diff --git a/.github/workflows/build_one.yml b/.github/workflows/build_one.yml index 45a9b76..ee10d37 100644 --- a/.github/workflows/build_one.yml +++ b/.github/workflows/build_one.yml @@ -19,6 +19,8 @@ on: ARTIFACTORY: required: true +run-name: Build ${{ inputs.conanfile }} version ${{ inputs.package_version }} + jobs: generate-matrix: runs-on: ubuntu-24.04 @@ -43,8 +45,10 @@ jobs: run: python scripts/list_build_matrix.py env: GITHUB_CONTEXT: ${{ toJson(github) }} + GITHUB_INPUT: ${{ toJson(inputs) }} build: + if: ${{ needs.generate-matrix.outputs.matrix != '[]' && needs.generate-matrix.outputs.matrix != '' }} name : ${{ matrix.config.host_profile }} needs: - generate-matrix diff --git a/.github/workflows/remove.yml b/.github/workflows/remove.yml index 6200120..cb953ff 100644 --- a/.github/workflows/remove.yml +++ b/.github/workflows/remove.yml @@ -4,23 +4,9 @@ on: workflow_dispatch: inputs: package_name: - description: Package name - type: choice - options: - - all - - odrcore - - pdf2htmlex - - fontforge - - poppler - - poppler-data - - cairo - - openlibm - - fontconfig - - glib - - tmpfile - - libgsf - - libwmf - - wvware + description: Package name pattern + type: string + default: "*" run-name: Remove ${{ inputs.package_name }} from artifactory @@ -36,8 +22,4 @@ jobs: - run: conan remote add odr https://artifactory.opendocument.app/artifactory/api/conan/conan - run: conan remote login odr admin --password ${{ secrets.ARTIFACTORY }} - - run: conan remove --remote=odr "${{ github.event.inputs.package_name }}/*#*" --confirm - if: ${{ github.event.inputs.package_name != 'all' }} - - - run: conan remove --remote=odr '*' --confirm - if: ${{ github.event.inputs.package_name == 'all' }} + - run: conan remove --remote=odr "${{ github.event.inputs.package_name }}" --confirm diff --git a/scripts/list_build_matrix.py b/scripts/list_build_matrix.py index 7e90988..e641bc4 100644 --- a/scripts/list_build_matrix.py +++ b/scripts/list_build_matrix.py @@ -188,8 +188,8 @@ def get_cli_args(): def get_github_args(): - event = json.loads(os.environ.get("GITHUB_CONTEXT", "{}")) - inputs = event.get("inputs", {}) + github = json.loads(os.environ.get("GITHUB_CONTEXT", "{}")) + inputs = json.loads(os.environ.get("GITHUB_INPUT", "{}")) conanfile = inputs.get("conanfile") version = inputs.get("package_version") diff --git a/scripts/list_package_references.py b/scripts/list_package_references.py index 0a7b1e3..491127c 100644 --- a/scripts/list_package_references.py +++ b/scripts/list_package_references.py @@ -155,8 +155,9 @@ def get_cli_args(): def get_github_args(): github = json.loads(os.environ.get("GITHUB_CONTEXT", "{}")) + inputs = json.loads(os.environ.get("GITHUB_INPUT", "{}")) + event = github.get("event", {}) - inputs = event.get("inputs", {}) selection_config = root_path / "defaults.yaml"