This is an automated email from the ASF dual-hosted git repository. sjanc pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mynewt-core.git
commit b70bbf29246cd36b24e3c6d9cb65453a1b1ddaa7 Author: Szymon Janc <[email protected]> AuthorDate: Tue Oct 13 19:26:55 2026 +0200 ci: Use single project file for all jobs After removing repositories filters, project files used by build and test jobs are the same. Remove duplicates and use .github/project.yml for all jobs. Jobs restoring project prepared by prepare job no longer need to replace project file. Assisted-by: Claude:claude-opus-5-5 --- .github/actions/newt-project-restore/action.yml | 12 +++------- .github/actions/newt-project/action.yml | 11 ++++----- .github/project_build_all_apps.yml | 32 ------------------------- .github/project_build_cc_target.yml | 32 ------------------------- .github/project_build_mtest_apps.yml | 32 ------------------------- .github/project_newt_test_all.yml | 32 ------------------------- .github/workflows/build.yml | 19 --------------- .github/workflows/build_bootloader_main.yml | 2 -- 8 files changed, 8 insertions(+), 164 deletions(-) diff --git a/.github/actions/newt-project-restore/action.yml b/.github/actions/newt-project-restore/action.yml index e0bfdf539..084172c4b 100644 --- a/.github/actions/newt-project-restore/action.yml +++ b/.github/actions/newt-project-restore/action.yml @@ -21,12 +21,9 @@ name: Restore newt project description: > Restore newt and newt project prepared by prepare job of the same workflow run, so that external repositories are downloaded only once - per run. Project file is replaced with one provided by job. + per run. inputs: - project: - description: Project file to use (relative to repository root) - required: true path: description: Directory to restore project to required: false @@ -50,12 +47,9 @@ runs: mv "${{ inputs.path }}/.newt-bin" "$GITHUB_WORKSPACE/.newt-bin" echo "$GITHUB_WORKSPACE/.newt-bin" >> "$GITHUB_PATH" - # Repositories were upgraded by prepare job for tested commit, so - # only project file needs to be updated. - - name: Set up project file + # Project was set up and upgraded by prepare job for tested commit + - name: Show project info shell: bash run: | - cp -f "${{ inputs.project }}" "${{ inputs.path }}/project.yml" - sed -i "s/0.0.0/$GITHUB_SHA-commit/g" "${{ inputs.path }}/project.yml" cd "${{ inputs.path }}" newt info diff --git a/.github/actions/newt-project/action.yml b/.github/actions/newt-project/action.yml index 2be139cd6..0d7da005d 100644 --- a/.github/actions/newt-project/action.yml +++ b/.github/actions/newt-project/action.yml @@ -21,16 +21,15 @@ name: Set up newt project description: > Create newt project for testing current commit. External repositories are restored from cache and then upgraded by newt, so only changes - since cache was created are downloaded. Single cache is shared by all - projects since newt skips repositories not used by project. Cache - should be saved only by job using project with all repositories and - only from master branch, since only caches from default branch are - available to pull requests. + since cache was created are downloaded. Cache should be saved only by + one job and only from master branch, since only caches from default + branch are available to pull requests. inputs: project: description: Project file to use (relative to repository root) - required: true + required: false + default: .github/project.yml path: description: Directory to create project in required: false diff --git a/.github/project_build_all_apps.yml b/.github/project_build_all_apps.yml deleted file mode 100644 index 4d8137416..000000000 --- a/.github/project_build_all_apps.yml +++ /dev/null @@ -1,32 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -project.name: "my_project" - -project.repositories: - - apache-mynewt-core - -# Use github's distribution mechanism for core ASF libraries. -# This provides mirroring automatically for us. -# -repository.apache-mynewt-core: - type: github - vers: 0.0.0 - user: apache - repo: mynewt-core diff --git a/.github/project_build_cc_target.yml b/.github/project_build_cc_target.yml deleted file mode 100644 index 4d8137416..000000000 --- a/.github/project_build_cc_target.yml +++ /dev/null @@ -1,32 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -project.name: "my_project" - -project.repositories: - - apache-mynewt-core - -# Use github's distribution mechanism for core ASF libraries. -# This provides mirroring automatically for us. -# -repository.apache-mynewt-core: - type: github - vers: 0.0.0 - user: apache - repo: mynewt-core diff --git a/.github/project_build_mtest_apps.yml b/.github/project_build_mtest_apps.yml deleted file mode 100644 index 7f0c07986..000000000 --- a/.github/project_build_mtest_apps.yml +++ /dev/null @@ -1,32 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -project.name: "build_mtest_apps" - -project.repositories: - - apache-mynewt-core - -# Use github's distribution mechanism for core ASF libraries. -# This provides mirroring automatically for us. -# -repository.apache-mynewt-core: - type: github - vers: 0.0.0 - user: apache - repo: mynewt-core diff --git a/.github/project_newt_test_all.yml b/.github/project_newt_test_all.yml deleted file mode 100644 index 4d8137416..000000000 --- a/.github/project_newt_test_all.yml +++ /dev/null @@ -1,32 +0,0 @@ -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -project.name: "my_project" - -project.repositories: - - apache-mynewt-core - -# Use github's distribution mechanism for core ASF libraries. -# This provides mirroring automatically for us. -# -repository.apache-mynewt-core: - type: github - vers: 0.0.0 - user: apache - repo: mynewt-core diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94d72e555..17eff81e9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -69,7 +69,6 @@ jobs: - name: Set up project uses: ./.github/actions/newt-project with: - project: .github/project.yml save-cache: true - name: Pack project shell: bash @@ -104,8 +103,6 @@ jobs: sudo apt-get install -y gcc-multilib ccache - name: Restore project uses: ./.github/actions/newt-project-restore - with: - project: .github/project.yml - name: Restore ccache uses: ./.github/actions/ccache-restore with: @@ -148,8 +145,6 @@ jobs: artifact: newt - name: Set up project uses: ./.github/actions/newt-project - with: - project: .github/project.yml - name: Build Blinky shell: bash run: | @@ -175,8 +170,6 @@ jobs: sudo apt-get install -y gcc-multilib ccache - name: Restore project uses: ./.github/actions/newt-project-restore - with: - project: .github/project.yml - name: Restore ccache uses: ./.github/actions/ccache-restore with: @@ -214,8 +207,6 @@ jobs: sudo apt-get install -y gcc-multilib ccache - name: Restore project uses: ./.github/actions/newt-project-restore - with: - project: .github/project_build_all_apps.yml - name: Remove project targets shell: bash run: rm -rf build/targets @@ -248,8 +239,6 @@ jobs: release: '15.2.Rel1' - name: Restore project uses: ./.github/actions/newt-project-restore - with: - project: .github/project.yml - name: Remove project targets shell: bash run: rm -rf build/targets @@ -301,8 +290,6 @@ jobs: artifact: newt - name: Set up project uses: ./.github/actions/newt-project - with: - project: .github/project.yml - name: Remove project targets shell: bash run: rm -rf build/targets @@ -329,8 +316,6 @@ jobs: sudo apt-get install -y gcc-multilib ccache - name: Restore project uses: ./.github/actions/newt-project-restore - with: - project: .github/project_build_mtest_apps.yml - name: Remove project targets shell: bash run: rm -rf build/targets @@ -367,8 +352,6 @@ jobs: release: ${{ matrix.gcc }} - name: Restore project uses: ./.github/actions/newt-project-restore - with: - project: .github/project_build_cc_target.yml - name: Restore ccache uses: ./.github/actions/ccache-restore with: @@ -397,8 +380,6 @@ jobs: sudo apt-get install -y gcc-multilib ccache - name: Restore project uses: ./.github/actions/newt-project-restore - with: - project: .github/project_newt_test_all.yml - name: Restore ccache uses: ./.github/actions/ccache-restore with: diff --git a/.github/workflows/build_bootloader_main.yml b/.github/workflows/build_bootloader_main.yml index fbb6f0c60..ad1d0a4b7 100644 --- a/.github/workflows/build_bootloader_main.yml +++ b/.github/workflows/build_bootloader_main.yml @@ -46,8 +46,6 @@ jobs: uses: ./.github/actions/newt-install - name: Set up project uses: ./.github/actions/newt-project - with: - project: .github/project.yml - name: Restore ccache uses: ./.github/actions/ccache-restore with:
