Skip to content

Commit

Permalink
fix: remove MQTT lightbulb demo
Browse files Browse the repository at this point in the history
  • Loading branch information
coderbyheart committed Nov 27, 2023
1 parent c400c43 commit c74b1ae
Show file tree
Hide file tree
Showing 6 changed files with 3 additions and 106 deletions.
67 changes: 1 addition & 66 deletions .github/workflows/build-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -244,79 +244,14 @@ jobs:
zephyr.elf
.config
build-mqtt-light-bulb:
runs-on: ubuntu-22.04

needs: [release-version, date-string]

steps:
- uses: actions/checkout@v3
with:
path: firmware
submodules: recursive

- name: Configure the AWS IoT broker hostname
working-directory: firmware
run: |
echo "CONFIG_MQTT_SAMPLE_TRANSPORT_BROKER_HOSTNAME=\"${{ env.BROKER_HOSTNAME }}\"" >> firmware.conf
echo "CONFIG_MQTT_HELPER_SEC_TAG=42" >> firmware.conf
- run: cat firmware.conf
working-directory: firmware

- name: Build
working-directory: firmware
run: |
docker run --rm \
-v ${PWD}:/workdir/project \
-v ${PWD}/mqtt-light-bulb:/workdir/nrf \
-w /workdir/nrf/samples/net/mqtt-lightbulb \
nordicplayground/nrfconnect-sdk:v2.3-branch \
west build \
-p always \
-b thingy91_nrf9160_ns \
--build-dir /workdir/project/build \
-- \
-DOVERLAY_CONFIG="/workdir/nrf/samples/net/mqtt-lightbulb/overlay-tls-nrf9160.conf;/workdir/project/light-bulb.conf;/workdir/project/firmware.conf" \
-DEXTRA_CFLAGS="-Werror"
- run: cat firmware/firmware.conf
if: failure()

- run: cat firmware/build/zephyr/.config
if: failure()

- run: cat firmware/build/zephyr/zephyr.dts
if: failure()

- name: Copy firmware
run: |
cp firmware/build/zephyr/merged.hex ./
cp firmware/build/zephyr/app_signed.hex ./
cp firmware/build/zephyr/app_update.bin ./
cp firmware/build/zephyr/zephyr.elf ./
cp firmware/build/zephyr/.config ./
- uses: actions/upload-artifact@v3
if: always()
with:
name: thingy91.mqtt-light-bulb-${{ needs.date-string.outputs.dateAsString }}-${{ github.sha }}
path: |
merged.hex
app_signed.hex
app_update.bin
firmware.conf
zephyr.elf
.config
release:
name: Release
runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/saga' && (github.event_name == 'push' ||
github.event_name == 'workflow_dispatch' || github.event_name ==
'repository_dispatch')

needs: [build-asset_tracker_v2, build-mqtt-light-bulb]
needs: [build-asset_tracker_v2]

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down
6 changes: 1 addition & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
[submodule "sdk-nrf"]
path = sdk-nrf
url = https://github.com/maxd-nordic/sdk-nrf.git
branch = atv2-ina3221
[submodule "mqtt-light-bulb"]
path = mqtt-light-bulb
url = https://github.com/maxd-nordic/sdk-nrf.git
branch = mqtt-light-bulb
branch = atv2-ina3221
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
![Build and Release](https://github.com/NordicPlayground/thingy-world-firmware-aws/workflows/Build%20and%20Release/badge.svg)
[![@commitlint/config-conventional](https://img.shields.io/badge/%40commitlint-config--conventional-brightgreen)](https://github.com/conventional-changelog/commitlint/tree/master/@commitlint/config-conventional)

Firmware for devices connecting to the [thingy.world cloud backend](https://github.com/NordicPlayground/thingy-rocks-cloud-aws-js) based on the `asset_tracker_v2` and `MQTT sample` from the [nRF Connect SDK](https://github.com/nrfconnect/sdk-nrf) version 2.3.0.
Firmware for devices connecting to the [thingy.world cloud backend](https://github.com/NordicPlayground/thingy-rocks-cloud-aws-js) based on the `asset_tracker_v2` from the [nRF Connect SDK](https://github.com/nrfconnect/sdk-nrf).
13 changes: 0 additions & 13 deletions light-bulb.conf

This file was deleted.

1 change: 0 additions & 1 deletion mqtt-light-bulb
Submodule mqtt-light-bulb deleted from 311df6
20 changes: 0 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -286,26 +286,6 @@
"path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/nrf9160dk.debug.wifi-*/zephyr.elf",
"name": "thingy_world-nRF9160DK-debug.wifi-${nextRelease.gitTag}.elf",
"label": "Symbol file for nRF9160 DK with WiFi Shield firmware (debug)"
},
{
"path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.mqtt-light-bulb-*/merged.hex",
"name": "thingy_world-Thingy91-mqtt-light-bulb-${nextRelease.gitTag}.hex",
"label": "Pre-build HEX file for Thingy:91 MQTT Light Bulb"
},
{
"path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.mqtt-light-bulb-*/app_signed.hex",
"name": "thingy_world-Thingy91-mqtt-light-bulb-${nextRelease.gitTag}-signed.hex",
"label": "Pre-build HEX file for Thingy:91 MQTT Light Bulb"
},
{
"path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.mqtt-light-bulb-*/app_update.bin",
"name": "thingy_world-Thingy91-mqtt-light-bulb-${nextRelease.gitTag}-app_upgrade.bin",
"label": "App upgrade file for Thingy:91 MQTT Light Bulb"
},
{
"path": "/home/runner/work/thingy-world-firmware-aws/thingy-world-firmware-aws/thingy91.mqtt-light-bulb-*/zephyr.elf",
"name": "thingy_world-Thingy91-mqtt-light-bulb-${nextRelease.gitTag}.elf",
"label": "Symbol file for Thingy:91 MQTT Light Bulb"
}
]
}
Expand Down

0 comments on commit c74b1ae

Please sign in to comment.