@@ -33,13 +33,11 @@ jobs:
3333 # export at output variables, flatten as JSON
3434 - id : set-env
3535 run : |
36- content='${{ toJson(env) }}'
37- echo $content
38- content="${content//'%'/'%25'}"
39- content="${content//$'\n'/''}"
40- content="${content//$'\r'/''}"
36+ content='${{ toJson(env) }}' # convert env vars to json
37+ content="${content//'%'/'%25'}" # escape percent entities
38+ content="${content//$'\n'/''}" # remove lf
39+ content="${content//$'\r'/''}" # remove cr
4140 echo "env=${content}" >> $GITHUB_OUTPUT
42- # echo "::set-output name=env::${content}"
4341
4442 build :
4543 name : ${{matrix.board}}@${{matrix.platform-version}}
@@ -70,21 +68,24 @@ jobs:
7068
7169 include :
7270 # multidimensional matrix doesn't apply to these profiles, so they are explicitely populated
73- - { board: d1_mini, platform: esp8266, archi: esp8266, platform-version: 3.0.1, ... }
74- - { board: d1_mini, platform: esp8266, archi: esp8266, platform-version: latest, ... }
75- - { board: seeed_wio_terminal, platform: Seeeduino, archi: samd, platform-version: 1.8.2, ... }
76- - { board: seeed_wio_terminal, platform: Seeeduino, archi: samd, platform-version: latest, ... }
77- - { board: rpipico, platform: rp2040, archi: rp2040, platform-version: 2.3.3, ... }
78- - { board: rpipico, platform: rp2040, archi: rp2040, platform-version: latest, ... }
71+
72+ - { board: d1_mini, platform: esp8266, arch: esp8266, platform-version: 3.0.1, ... }
73+ - { board: d1_mini, platform: esp8266, arch: esp8266, platform-version: latest, ... }
74+
75+ - { board: seeed_wio_terminal, platform: Seeeduino, arch: samd, platform-version: 1.8.2, ... }
76+ - { board: seeed_wio_terminal, platform: Seeeduino, arch: samd, platform-version: latest, ... }
77+
78+ - { board: rpipico, platform: rp2040, arch: rp2040, platform-version: 2.3.3, ... }
79+ - { board: rpipico, platform: rp2040, arch: rp2040, platform-version: latest, ... }
7980
8081 # multidimensional matrix applies to these:
81- - { board: esp32, platform: esp32, archi : esp32, ... }
82- - { board: esp32s2, platform: esp32, archi : esp32, ... }
83- - { board: esp32s3, platform: esp32, archi : esp32, ... }
84- - { board: esp32c3, platform: esp32, archi : esp32, ... }
82+ - { board: esp32, platform: esp32, arch : esp32, ... }
83+ - { board: esp32s2, platform: esp32, arch : esp32, ... }
84+ - { board: esp32s3, platform: esp32, arch : esp32, ... }
85+ - { board: esp32c3, platform: esp32, arch : esp32, ... }
8586
8687 exclude :
87- # multidimensional matrix excludes these (no support or unstable):
88+ # multidimensional matrix excludes (no support or unstable):
8889
8990 - { board: esp32s2, platform-version: 1.0.6 }
9091 - { board: esp32s2, platform-version: 2.0.0 }
@@ -103,7 +104,7 @@ jobs:
103104
104105 steps :
105106 - name : Checkout
106- uses : actions/checkout@v2
107+ uses : actions/checkout@v3
107108 with :
108109 ref : ${{ github.event.pull_request.head.sha }}
109110
@@ -133,8 +134,8 @@ jobs:
133134 # populate values for the next step
134135 arduino_platform_url=${board_urls[$platform_name]}
135136 arduino_cli_args=${cli_args[$platform_name]}
136- arduino_board_fqbn=${{matrix.platform}}:${{matrix.archi }}:${{matrix.board}}${fbqn_extras[$board_name]}
137- arduino_platform=${{matrix.platform}}:${{matrix.archi }}@${{matrix.platform-version}}
137+ arduino_board_fqbn=${{matrix.platform}}:${{matrix.arch }}:${{matrix.board}}${fbqn_extras[$board_name]}
138+ arduino_platform=${{matrix.platform}}:${{matrix.arch }}@${{matrix.platform-version}}
138139
139140 # export to env
140141 echo "ARDUINO_PLATFORM=$arduino_platform" >> $GITHUB_ENV
@@ -146,7 +147,6 @@ jobs:
146147 - name : Compile example
147148 uses : ArminJo/arduino-test-compile@master
148149 with :
149- # arduino-board-fqbn: ${{matrix.platform}}:${{matrix.archi}}:${{matrix.board}}
150150 arduino-board-fqbn : ${{env.ARDUINO_BOARD_FQBN}}
151151 arduino-platform : ${{env.ARDUINO_PLATFORM}}
152152 platform-url : ${{env.ARDUINO_PLATFORM_URL}}
0 commit comments