Skip to content

Commit a735d83

Browse files
committed
test secretes
1 parent 2a91d0c commit a735d83

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

.github/workflows/compile-blink.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ jobs:
3131

3232
# workflow call
3333
uses: ./.github/workflows/compile.yaml
34+
secrets: inherit
3435
with:
3536
platform: ${{ matrix.platform.name }}
3637
version: ${{ matrix.platform.version }}

.github/workflows/compile-publish.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ jobs:
3030

3131
# workflow call
3232
uses: ./.github/workflows/compile.yaml
33+
secrets: inherit
3334
with:
3435
platform: ${{ matrix.platform.name }}
3536
version: ${{ matrix.platform.version }}

.github/workflows/compile.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
mv $aux ${{ inputs.src }}
5757
done
5858
59-
- name: Compile in cloud
59+
- name: Compile in cloud (on master)
6060
id: compile
6161
uses: particle-iot/compile-action@v1
6262
with:
@@ -65,6 +65,14 @@ jobs:
6565
device-os-version: ${{ inputs.version }}
6666
sources-folder: ${{ inputs.src }}
6767

68+
- name: Compile locally # if not on master or if cloud compile failed
69+
if: ${{ failure() || github.ref != 'refs/heads/master' }}
70+
uses: particle-iot/compile-action@v1
71+
with:
72+
particle-platform-name: ${{ inputs.platform }}
73+
device-os-version: ${{ inputs.version }}
74+
sources-folder: ${{ inputs.src }}
75+
6876
- name: Move binary
6977
run: |
7078
mv ${{ steps.compile.outputs.firmware-path }} ${{ inputs.src }}/${{ inputs.src }}-${{ inputs.platform }}-${{ inputs.version }}.bin
@@ -74,11 +82,3 @@ jobs:
7482
with:
7583
name: ${{ inputs.src }}-${{ inputs.platform }}-${{ inputs.version }}
7684
path: ${{ inputs.src }}
77-
78-
- name: Compile locally to debug
79-
if: ${{ failure() }}
80-
uses: particle-iot/compile-action@v1
81-
with:
82-
particle-platform-name: ${{ inputs.platform }}
83-
device-os-version: ${{ inputs.version }}
84-
sources-folder: ${{ inputs.src }}

LoggerCore/src/LoggerPlatform.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22

33
#include "Particle.h"
44

5+
// address issue where this is not defined anymore in newer firmware
6+
#ifndef PLATFORM_PHOTON
7+
#define PLATFORM_PHOTON 0
8+
#endif
9+
510
// file helper to get at flash system usage
611
// dependencies.FileHelperRK=0.0.3
712
#include "FileHelperRK.h"

src/blink/blink.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ void info_handler(const char *topic, const char *data) {
3434
}
3535

3636
// enable sysstem treading
37+
#ifndef SYSTEM_VERSION_v620
3738
SYSTEM_THREAD(ENABLED);
39+
#endif
3840

3941
// manual mode
4042
SYSTEM_MODE(MANUAL);

0 commit comments

Comments
 (0)