Skip to content

Commit ca06063

Browse files
me-no-devme-no-dev
committed
Enable builds again
1 parent ee2f99f commit ca06063

File tree

3 files changed

+106
-105
lines changed

3 files changed

+106
-105
lines changed

‎.github/workflows/cron.yml

Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,86 @@ jobs:
4040
with:
4141
name: artifacts
4242
path: dist
43+
44+
45+
# check:
46+
# name: Check if result should be deployed
47+
# runs-on: ubuntu-latest
48+
# outputs:
49+
# idf_commit: ${{ steps.check.outputs.idf_commit }}
50+
# ar_branch: ${{ steps.check.outputs.ar_branch }}
51+
# ar_new_commit_message: ${{ steps.check.outputs.ar_new_commit_message }}
52+
# ar_new_branch_name: ${{ steps.check.outputs.ar_new_branch_name }}
53+
# ar_new_pr_title: ${{ steps.check.outputs.ar_new_pr_title }}
54+
# ar_has_commit: ${{ steps.check.outputs.ar_has_commit }}
55+
# ar_has_branch: ${{ steps.check.outputs.ar_has_branch }}
56+
# ar_has_pr: ${{ steps.check.outputs.ar_has_pr }}
57+
# libs_version: ${{ steps.check.outputs.libs_version }}
58+
# libs_has_commit: ${{ steps.check.outputs.libs_has_commit }}
59+
# libs_has_branch: ${{ steps.check.outputs.libs_has_branch }}
60+
# steps:
61+
# - uses: actions/checkout@v3
62+
# - id: check
63+
# env:
64+
# GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
65+
# GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
66+
# GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
67+
# run: bash ./tools/check-deploy-needed.sh
68+
69+
# build:
70+
# name: Build Libs for ${{ matrix.target }}
71+
# runs-on: ubuntu-latest
72+
# needs: check
73+
# strategy:
74+
# matrix:
75+
# target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6, esp32h2]
76+
# fail-fast: false
77+
# steps:
78+
# - uses: actions/checkout@v3
79+
# # - name: Install dependencies
80+
# # run: bash ./tools/prepare-ci.sh
81+
# - shell: bash
82+
# name: Build Libs for ${{ matrix.target }}
83+
# run: echo ${{ matrix.target }}
84+
# # run: bash ./build.sh -t ${{ matrix.target }}
85+
# # - name: Upload archive
86+
# # uses: actions/upload-artifact@v3
87+
# # with:
88+
# # name: artifacts
89+
# # path: dist
90+
91+
# deploy:
92+
# name: Deploy build
93+
# runs-on: ubuntu-latest
94+
# needs: [check, build]
95+
# steps:
96+
# - uses: actions/checkout@v3
97+
# - shell: bash
98+
# env:
99+
# GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
100+
# GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
101+
# GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
102+
# IDF_COMMIT: ${{ needs.check.outputs.idf_commit }}
103+
# AR_BRANCH: ${{ needs.check.outputs.ar_branch }}
104+
# AR_NEW_COMMIT_MESSAGE: ${{ needs.check.outputs.ar_new_commit_message }}
105+
# AR_NEW_BRANCH_NAME: ${{ needs.check.outputs.ar_new_branch_name }}
106+
# AR_NEW_PR_TITLE: ${{ needs.check.outputs.ar_new_pr_title }}
107+
# AR_HAS_COMMIT: ${{ needs.check.outputs.ar_has_commit }}
108+
# AR_HAS_BRANCH: ${{ needs.check.outputs.ar_has_branch }}
109+
# AR_HAS_PR: ${{ needs.check.outputs.ar_has_pr }}
110+
# LIBS_VERSION: ${{ needs.check.outputs.libs_version }}
111+
# LIBS_HAS_COMMIT: ${{ needs.check.outputs.libs_has_commit }}
112+
# LIBS_HAS_BRANCH: ${{ needs.check.outputs.libs_has_branch }}
113+
# run: |
114+
# echo "IDF_COMMIT: $IDF_COMMIT"
115+
# echo "AR_BRANCH: $AR_BRANCH"
116+
# echo "AR_NEW_COMMIT_MESSAGE: $AR_NEW_COMMIT_MESSAGE"
117+
# echo "AR_NEW_BRANCH_NAME: $AR_NEW_BRANCH_NAME"
118+
# echo "AR_NEW_PR_TITLE: $AR_NEW_PR_TITLE"
119+
# echo "AR_HAS_COMMIT: $AR_HAS_COMMIT"
120+
# echo "AR_HAS_BRANCH: $AR_HAS_BRANCH"
121+
# echo "AR_HAS_PR: $AR_HAS_PR"
122+
# echo "LIBS_VERSION: $LIBS_VERSION"
123+
# echo "LIBS_HAS_COMMIT: $LIBS_HAS_COMMIT"
124+
# echo "LIBS_HAS_BRANCH: $LIBS_HAS_BRANCH"
125+

‎.github/workflows/push.yml

Lines changed: 21 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -11,119 +11,35 @@ concurrency:
1111
cancel-in-progress: true
1212

1313
jobs:
14-
check:
15-
name: Check if result should be deployed
16-
runs-on: ubuntu-latest
17-
outputs:
18-
idf_commit: ${{ steps.check.outputs.idf_commit }}
19-
ar_branch: ${{ steps.check.outputs.ar_branch }}
20-
ar_new_commit_message: ${{ steps.check.outputs.ar_new_commit_message }}
21-
ar_new_branch_name: ${{ steps.check.outputs.ar_new_branch_name }}
22-
ar_new_pr_title: ${{ steps.check.outputs.ar_new_pr_title }}
23-
ar_has_commit: ${{ steps.check.outputs.ar_has_commit }}
24-
ar_has_branch: ${{ steps.check.outputs.ar_has_branch }}
25-
ar_has_pr: ${{ steps.check.outputs.ar_has_pr }}
26-
libs_version: ${{ steps.check.outputs.libs_version }}
27-
libs_has_commit: ${{ steps.check.outputs.libs_has_commit }}
28-
libs_has_branch: ${{ steps.check.outputs.libs_has_branch }}
29-
steps:
30-
- uses: actions/checkout@v3
31-
- id: check
32-
env:
33-
GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
34-
GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
35-
GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
36-
run: bash ./tools/check-deploy-needed.sh
37-
38-
build:
14+
build-libs:
3915
name: Build Libs for ${{ matrix.target }}
4016
runs-on: ubuntu-latest
41-
needs: check
4217
strategy:
4318
matrix:
4419
target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6, esp32h2]
4520
fail-fast: false
4621
steps:
4722
- uses: actions/checkout@v3
48-
# - name: Install dependencies
49-
# run: bash ./tools/prepare-ci.sh
50-
- shell: bash
51-
name: Build Libs for ${{ matrix.target }}
52-
run: echo ${{ matrix.target }}
53-
# run: bash ./build.sh -t ${{ matrix.target }}
54-
# - name: Upload archive
55-
# uses: actions/upload-artifact@v3
56-
# with:
57-
# name: artifacts
58-
# path: dist
59-
60-
deploy:
61-
name: Deploy build
23+
- name: Install dependencies
24+
run: bash ./tools/prepare-ci.sh
25+
- name: Build Libs for ${{ matrix.target }}
26+
run: bash ./build.sh -e -t ${{ matrix.target }}
27+
- name: Upload archive
28+
uses: actions/upload-artifact@v3
29+
with:
30+
name: artifacts
31+
path: dist
32+
33+
inspect-artifacts:
34+
name: Check resulting artifacts
35+
needs: build-libs
6236
runs-on: ubuntu-latest
63-
needs: [check, build]
6437
steps:
65-
- uses: actions/checkout@v3
66-
- shell: bash
67-
env:
68-
GITHUB_TOKEN: ${{ secrets.PUSH_TOKEN }}
69-
GIT_AUTHOR_EMAIL: ${{ secrets.PUSH_EMAIL }}
70-
GIT_COMMITTER_EMAIL: ${{ secrets.PUSH_EMAIL }}
71-
IDF_COMMIT: ${{ needs.check.outputs.idf_commit }}
72-
AR_BRANCH: ${{ needs.check.outputs.ar_branch }}
73-
AR_NEW_COMMIT_MESSAGE: ${{ needs.check.outputs.ar_new_commit_message }}
74-
AR_NEW_BRANCH_NAME: ${{ needs.check.outputs.ar_new_branch_name }}
75-
AR_NEW_PR_TITLE: ${{ needs.check.outputs.ar_new_pr_title }}
76-
AR_HAS_COMMIT: ${{ needs.check.outputs.ar_has_commit }}
77-
AR_HAS_BRANCH: ${{ needs.check.outputs.ar_has_branch }}
78-
AR_HAS_PR: ${{ needs.check.outputs.ar_has_pr }}
79-
LIBS_VERSION: ${{ needs.check.outputs.libs_version }}
80-
LIBS_HAS_COMMIT: ${{ needs.check.outputs.libs_has_commit }}
81-
LIBS_HAS_BRANCH: ${{ needs.check.outputs.libs_has_branch }}
82-
run: |
83-
echo "IDF_COMMIT: $IDF_COMMIT"
84-
echo "AR_BRANCH: $AR_BRANCH"
85-
echo "AR_NEW_COMMIT_MESSAGE: $AR_NEW_COMMIT_MESSAGE"
86-
echo "AR_NEW_BRANCH_NAME: $AR_NEW_BRANCH_NAME"
87-
echo "AR_NEW_PR_TITLE: $AR_NEW_PR_TITLE"
88-
echo "AR_HAS_COMMIT: $AR_HAS_COMMIT"
89-
echo "AR_HAS_BRANCH: $AR_HAS_BRANCH"
90-
echo "AR_HAS_PR: $AR_HAS_PR"
91-
echo "LIBS_VERSION: $LIBS_VERSION"
92-
echo "LIBS_HAS_COMMIT: $LIBS_HAS_COMMIT"
93-
echo "LIBS_HAS_BRANCH: $LIBS_HAS_BRANCH"
94-
95-
# build-libs:
96-
# name: Build Libs for ${{ matrix.target }}
97-
# runs-on: ubuntu-latest
98-
# strategy:
99-
# matrix:
100-
# target: [esp32, esp32s2, esp32s3, esp32c3, esp32c6, esp32h2]
101-
# fail-fast: false
102-
# steps:
103-
# - uses: actions/checkout@v3
104-
# - name: Install dependencies
105-
# run: bash ./tools/prepare-ci.sh
106-
# - name: Build Libs for ${{ matrix.target }}
107-
# run: bash ./build.sh -t ${{ matrix.target }}
108-
# - name: Upload archive
109-
# uses: actions/upload-artifact@v3
110-
# with:
111-
# name: artifacts
112-
# path: out
113-
114-
# inspect-artifacts:
115-
# name: Check resulting artifacts
116-
# needs: build-libs
117-
# runs-on: ubuntu-latest
118-
# steps:
119-
# - name: Download artifacts
120-
# uses: actions/download-artifact@v3
121-
# with:
122-
# name: artifacts
123-
# path: out
124-
# - shell: bash
125-
# run: |
126-
# ls -l out
127-
# ls -l out/tools
128-
# ls -l out/tools/esp32-arduino-libs
38+
- name: Download artifacts
39+
uses: actions/download-artifact@v3
40+
with:
41+
name: artifacts
42+
path: dist
43+
- shell: bash
44+
run: ls -l dist
12945

‎build.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ done
8686
shift $((OPTIND -1))
8787
CONFIGS=$@
8888

89+
mkdir -p dist
90+
8991
if [ $SKIP_ENV -eq 0 ]; then
9092
echo "* Installing/Updating ESP-IDF and all components..."
9193
# update components from git

0 commit comments

Comments
 (0)