Skip to content

Commit

Permalink
ok enable static and dynamic in CI/CD for MQTT #506
Browse files Browse the repository at this point in the history
  • Loading branch information
petersilva committed Jun 6, 2023
1 parent 76aeed2 commit 05e5c19
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/flow_mqtt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on:
types: [opened, edited, reopened]
push:
branches:
- turned_off_for_now_always_fails
- v03_wip

workflow_dispatch:
inputs:
Expand All @@ -23,7 +23,7 @@ jobs:
# Don't cancel the entire matrix when one job fails
fail-fast: false
matrix:
which_test: [ static_flow ]
which_test: [ static_flow, dynamic_flow ]
osver: [ "ubuntu-22.04" ]

runs-on: ${{ matrix.osver }}
Expand Down
9 changes: 3 additions & 6 deletions travis/flow_autoconfig_add_mosquitto.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Flow Test Autoconfig

#
# Script not meant to be run on personal machines (may break some configs)
# Intended use case is a fresh sys (tested on ubuntu18.04desktop)
Expand All @@ -15,8 +15,8 @@ mkdir -p ~/.config/sr3

sed -i 's/MQP=amqp/MQP=mqtt/' ~/.config/sr3/default.conf

ADMIN_PASSWORD="`grep 'amqp://bunnymaster' ~/.config/sr3/credentials.conf | sed 's+amqp:\/\/bunnymaster:++;s+@localhost/++'`"
OTHER_PASSWORD="`grep 'amqp://tsource' ~/.config/sr3/credentials.conf | sed 's+amqp:\/\/tsource:++;s+@localhost/++'`"
ADMIN_PASSWORD="`grep -e 'amqp://bunnymaster:.*@localhost' ~/.config/sr3/credentials.conf | head -1 | sed 's+amqp:\/\/bunnymaster:++;s+@localhost.*$++'`"
OTHER_PASSWORD="`grep -e 'amqp://tsource:.*@localhost' ~/.config/sr3/credentials.conf | head -1 | sed 's+amqp:\/\/tsource:++;s+@localhost.*$++'`"

cat >> ~/.config/sr3/credentials.conf << EOF
mqtt://bunnymaster:${ADMIN_PASSWORD}@localhost/
Expand Down Expand Up @@ -70,6 +70,3 @@ if [[ $(($check_wsl == "init" )) ]]; then
else
sudo systemctl restart mosquitto
fi

echo "dir: +${PWD}+"
git clone https://github.com/MetPX/sr_insects

0 comments on commit 05e5c19

Please sign in to comment.