From a9b61be951bd7022d67dc3befa0324d8a9b34a53 Mon Sep 17 00:00:00 2001 From: Alaa Saad Mansour Date: Fri, 16 Aug 2024 12:36:53 +0200 Subject: [PATCH] reference older commit of the mouse branch by pete --- .github/workflows/build.yml.custom | 161 ----------------------------- config/west.yml | 2 +- 2 files changed, 1 insertion(+), 162 deletions(-) delete mode 100644 .github/workflows/build.yml.custom diff --git a/.github/workflows/build.yml.custom b/.github/workflows/build.yml.custom deleted file mode 100644 index 2c7aeb43..00000000 --- a/.github/workflows/build.yml.custom +++ /dev/null @@ -1,161 +0,0 @@ -name: Reusable user config build - -on: - [push, pull_request, workflow_dispatch] - -jobs: - matrix: - runs-on: ubuntu-latest - name: Fetch Build Keyboards - outputs: - build_matrix: ${{ env.build_matrix }} - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Install yaml2json - run: python3 -m pip install remarshal - - - name: Fetch Build Matrix - run: | - echo "build_matrix=$(yaml2json '${{ inputs.build_matrix_path }}' | jq -c .)" >> $GITHUB_ENV - yaml2json "${{ inputs.build_matrix_path }}" | jq - - build: - runs-on: ubuntu-latest - container: - image: zmkfirmware/zmk-build-arm:stable@sha256:0979a8de325e3d822e48bd8d1d9efaee2984ad3750253119f920a342f0ce5cde - needs: matrix - name: Build - strategy: - fail-fast: false - matrix: ${{ fromJson(needs.matrix.outputs.build_matrix) }} - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Create build directory - run: | - echo "build_dir=$(mktemp -d)" >> $GITHUB_ENV - - - name: Prepare variables - shell: sh -x {0} - env: - board: ${{ matrix.board }} - shield: ${{ matrix.shield }} - artifact_name: ${{ matrix.artifact-name }} - snippet: ${{ matrix.snippet }} - run: | - if [ -e zephyr/module.yml ]; then - export zmk_load_arg=" -DZMK_EXTRA_MODULES='${GITHUB_WORKSPACE}'" - new_tmp_dir="${TMPDIR:-/tmp}/zmk-config" - mkdir -p "${new_tmp_dir}" - echo "base_dir=${new_tmp_dir}" >> $GITHUB_ENV - else - echo "base_dir=${GITHUB_WORKSPACE}" >> $GITHUB_ENV - fi - - if [ -n "${snippet}" ]; then - extra_west_args="-S \"${snippet}\"" - fi - - echo "zephyr_version=${ZEPHYR_VERSION}" >> $GITHUB_ENV - echo "extra_west_args=${extra_west_args}" >> $GITHUB_ENV - echo "extra_cmake_args=${shield:+-DSHIELD=\"$shield\"}${zmk_load_arg}" >> $GITHUB_ENV - echo "display_name=${shield:+$shield - }${board}" >> $GITHUB_ENV - echo "artifact_name=${artifact_name:-${shield:+$shield-}${board}-zmk}" >> $GITHUB_ENV - - - name: Copy config files to isolated temporary directory - run: | - if [ "${{ env.base_dir }}" != "${GITHUB_WORKSPACE}" ]; then - mkdir "${{ env.base_dir }}/${{ inputs.config_path }}" - cp -R ${{ inputs.config_path }}/* "${{ env.base_dir }}/${{ inputs.config_path }}/" - fi - - - name: Cache west modules - uses: actions/cache@v4 - continue-on-error: true - env: - cache_name: cache-zephyr-${{ env.zephyr_version }}-modules - with: - path: | - ${{ env.base_dir }}/modules/ - ${{ env.base_dir }}/tools/ - ${{ env.base_dir }}/zephyr/ - ${{ env.base_dir }}/bootloader/ - ${{ env.base_dir }}/zmk/ - key: ${{ runner.os }}-build-${{ env.cache_name }}-${{ hashFiles('**/west.yml', '**/build.yaml') }} - restore-keys: | - ${{ runner.os }}-build-${{ env.cache_name }}- - ${{ runner.os }}-build- - ${{ runner.os }}- - - - name: West Init - working-directory: ${{ env.base_dir }} - run: west init -l "${{ env.base_dir }}/${{ inputs.config_path }}" - - - name: West Update - working-directory: ${{ env.base_dir }} - run: west update - - - name: West Zephyr export - working-directory: ${{ env.base_dir }} - run: west zephyr-export - - - name: West Build (${{ env.display_name }}) - working-directory: ${{ env.base_dir }} - shell: sh -x {0} - run: west build -s zmk/app -d "${{ env.build_dir }}" -b "${{ matrix.board }}" ${{ env.extra_west_args }} -- -DZMK_CONFIG=${{ env.base_dir }}/${{ inputs.config_path }} ${{ env.extra_cmake_args }} ${{ matrix.cmake-args }} - - - name: ${{ env.display_name }} Kconfig file - run: | - if [ -f "${{ env.build_dir }}/zephyr/.config" ] - then - grep -v -e "^#" -e "^$" "${{ env.build_dir }}/zephyr/.config" | sort - else - echo "No Kconfig output" - fi - if: ${{ !cancelled() }} - - - name: ${{ env.display_name }} Devicetree file - run: | - if [ -f "${{ env.build_dir }}/zephyr/zephyr.dts" ] - then - cat "${{ env.build_dir }}/zephyr/zephyr.dts" - elif [ -f "${{ env.build_dir }}/zephyr/zephyr.dts.pre" ] - then - cat -s "${{ env.build_dir }}/zephyr/zephyr.dts.pre" - else - echo "No Devicetree output" - fi - if: ${{ !cancelled() }} - - - name: Rename artifacts - shell: sh -x {0} - run: | - mkdir "${{ env.build_dir }}/artifacts" - if [ -f "${{ env.build_dir }}/zephyr/zmk.uf2" ] - then - cp "${{ env.build_dir }}/zephyr/zmk.uf2" "${{ env.build_dir }}/artifacts/${{ env.artifact_name }}.uf2" - elif [ -f "${{ env.build_dir }}/zephyr/zmk.${{ inputs.fallback_binary }}" ] - then - cp "${{ env.build_dir }}/zephyr/zmk.${{ inputs.fallback_binary }}" "${{ env.build_dir }}/artifacts/${{ env.artifact_name }}.${{ inputs.fallback_binary }}" - fi - - - name: Archive (${{ env.display_name }}) - uses: actions/upload-artifact@v4 - with: - name: artifact-${{ env.artifact_name }} - path: ${{ env.build_dir }}/artifacts - - merge: - runs-on: ubuntu-latest - needs: build - name: Merge Output Artifacts - steps: - - name: Merge Artifacts - uses: actions/upload-artifact/merge@v4 - with: - name: ${{ inputs.archive_name }} - pattern: artifact-* - delete-merged: true \ No newline at end of file diff --git a/config/west.yml b/config/west.yml index 91293ec8..c65e979f 100644 --- a/config/west.yml +++ b/config/west.yml @@ -11,7 +11,7 @@ manifest: projects: - name: zmk remote: petejohanson - revision: feat/pointers-move-scroll + revision: d45cb3c26fc113357dfc035965e51c84e13e218d #pmw3610 trackball issue import: app/west.yml - name: chiptuner-zmk-module remote: petejohanson