Skip to content

Commit 21b78a9

Browse files
committed
Merge branch 'master' into test_ci
2 parents 40c9240 + 8222757 commit 21b78a9

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

.github/workflows/build_py_tools.yml

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ jobs:
5555
PIP_EXTRA_INDEX_URL: "https://dl.espressif.com/pypi"
5656
steps:
5757
- id: create_token
58-
uses: tibdex/github-app-token@v2
58+
uses: actions/create-github-app-token@v1
5959
with:
60-
app_id: "${{ secrets.TOOLS_UPLOAD_APP_ID }}"
61-
private_key: "${{ secrets.TOOLS_UPLOAD_APP_TOKEN }}"
60+
app-id: ${{ secrets.APP_ID }}
61+
private-key: ${{ secrets.APP_TOKEN }}
6262

6363
- name: List changed tools
6464
shell: bash
@@ -74,10 +74,25 @@ jobs:
7474
for tool in ${{ env.CHANGED_TOOLS }}; do
7575
echo "tool $tool was changed"
7676
done
77-
- name: Checkout repository
77+
78+
- name: Checkout user repository
7879
uses: actions/checkout@v4
7980
with:
8081
token: ${{ steps.create_token.outputs.token }}
82+
ref: ${{ github.event.pull_request.head.sha || github.sha }}
83+
persist-credentials: false
84+
sparse-checkout-cone-mode: false
85+
sparse-checkout: |
86+
/*
87+
!.github
88+
89+
# To avoid giving unknown scripts elevated permissions, download them from the master branch
90+
- name: Get CI scripts from master
91+
run: |
92+
mkdir -p .github
93+
cd .github
94+
curl https://codeload.github.com/${{ github.repository }}/tar.gz/master | tar -xz --strip=2 arduino-esp32-master/.github
95+
8196
- name: Set up Python 3.8
8297
# Skip setting python on ARM because of missing compatibility: https://github.com/actions/setup-python/issues/108
8398
if: inputs.os != 'ARM' && inputs.os != 'ARM64'

.github/workflows/pytools.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ jobs:
7171
TARGET: arm64
7272
SEPARATOR: ':'
7373
secrets:
74-
TOOLS_UPLOAD_APP_ID: ${{ secrets.TOOLS_UPLOAD_APP_ID }}
75-
TOOLS_UPLOAD_APP_TOKEN: ${{ secrets.TOOLS_UPLOAD_APP_TOKEN }}
74+
APP_ID: ${{ secrets.TOOLS_UPLOAD_APP_ID }}
75+
APP_TOKEN: ${{ secrets.TOOLS_UPLOAD_APP_TOKEN }}
7676
CERTIFICATE: ${{ secrets.CERTIFICATE }}
7777
CERTIFICATE_PASSWORD: ${{ secrets.CERTIFICATE_PASSWORD }}
7878
with:

0 commit comments

Comments
 (0)