From 823b87d8084d99320ee28af38a9fa43f652ce873 Mon Sep 17 00:00:00 2001 From: Jakub Andrysek Date: Wed, 15 Oct 2025 13:47:11 +0200 Subject: [PATCH 1/2] Trigger ci --- .github/workflows/push.yml | 94 +++++++++++++++++++------------------- cores/esp32/Arduino.h | 2 +- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 383f5d0861c..0dbd6fb9670 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -252,57 +252,57 @@ jobs: retention-days: 7 # Save artifacts to gh-pages - save-master-artifacts: - name: Save master artifacts - needs: build-arduino-linux - if: github.event_name == 'push' && github.ref == 'refs/heads/master' - runs-on: ubuntu-latest - steps: - # Check out repository - - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - with: - token: ${{secrets.GITHUB_TOKEN}} - fetch-depth: "0" + # save-master-artifacts: + # name: Save master artifacts + # needs: build-arduino-linux + # if: github.event_name == 'push' && github.ref == 'refs/heads/master' + # runs-on: ubuntu-latest + # steps: + # # Check out repository + # - name: Checkout repository + # uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + # with: + # token: ${{secrets.GITHUB_TOKEN}} + # fetch-depth: "0" - - name: Switch branch - run: git checkout remotes/origin/gh-pages + # - name: Switch branch + # run: git checkout remotes/origin/gh-pages - - name: Download sketches reports artifact - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1 - with: - pattern: pr_cli_compile_* - merge-multiple: true - path: master_cli_compile + # - name: Download sketches reports artifact + # uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e # v4.2.1 + # with: + # pattern: pr_cli_compile_* + # merge-multiple: true + # path: master_cli_compile - - name: List files in the directory - run: ls -R + # - name: List files in the directory + # run: ls -R - - name: Commit json files to gh-pages if on master - if: github.event_name == 'push' && github.ref == 'refs/heads/master' - continue-on-error: true - run: | - git config user.name "github-actions[bot]" - git config user.email "41898282+github-actions[bot]@users.noreply.github.com" - git add --all - git commit -m "Updated cli compile json files" - git push origin HEAD:gh-pages + # - name: Commit json files to gh-pages if on master + # if: github.event_name == 'push' && github.ref == 'refs/heads/master' + # continue-on-error: true + # run: | + # git config user.name "github-actions[bot]" + # git config user.email "41898282+github-actions[bot]@users.noreply.github.com" + # git add --all + # git commit -m "Updated cli compile json files" + # git push origin HEAD:gh-pages #Upload PR number as artifact - upload-pr-number: - name: Upload PR number - if: ${{ github.event_name == 'pull_request' && !startsWith(github.head_ref, 'release/') }} - runs-on: ubuntu-latest - steps: - - name: Save the PR number in an artifact - shell: bash - env: - PR_NUM: ${{ github.event.number }} - run: echo $PR_NUM > pr_num.txt + # upload-pr-number: + # name: Upload PR number + # if: ${{ github.event_name == 'pull_request' && !startsWith(github.head_ref, 'release/') }} + # runs-on: ubuntu-latest + # steps: + # - name: Save the PR number in an artifact + # shell: bash + # env: + # PR_NUM: ${{ github.event.number }} + # run: echo $PR_NUM > pr_num.txt - - name: Upload PR number - uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 - with: - name: pr_number - path: ./pr_num.txt - overwrite: true + # - name: Upload PR number + # uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2 + # with: + # name: pr_number + # path: ./pr_num.txt + # overwrite: true diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h index 5a5b0c6814c..daceb76fd6a 100644 --- a/cores/esp32/Arduino.h +++ b/cores/esp32/Arduino.h @@ -50,7 +50,7 @@ #define RAD_TO_DEG 57.295779513082320876798154814105 #define EULER 2.718281828459045235360287471352 -#define SERIAL 0x0 +#define SERIAL 0x00 #define DISPLAY 0x1 #define LSBFIRST 0 From 232f7b2880773ecf873797ac246ffba82725cffa Mon Sep 17 00:00:00 2001 From: Jakub Andrysek Date: Wed, 15 Oct 2025 13:48:22 +0200 Subject: [PATCH 2/2] fix: correct SERIAL definition to use a more concise representation --- cores/esp32/Arduino.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cores/esp32/Arduino.h b/cores/esp32/Arduino.h index daceb76fd6a..5a5b0c6814c 100644 --- a/cores/esp32/Arduino.h +++ b/cores/esp32/Arduino.h @@ -50,7 +50,7 @@ #define RAD_TO_DEG 57.295779513082320876798154814105 #define EULER 2.718281828459045235360287471352 -#define SERIAL 0x00 +#define SERIAL 0x0 #define DISPLAY 0x1 #define LSBFIRST 0