Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
19355f2
chore: update compose with supermq override
felixgateru Mar 4, 2025
d390a4a
chore: remove duplicate env variables
felixgateru Mar 4, 2025
2cf0446
ci(check-license.yaml): ignore rabbitmq files
felixgateru Mar 4, 2025
9bcec44
refactor: add supermq docker file
felixgateru Mar 7, 2025
748eaa1
feat: add update option to make file
felixgateru Mar 10, 2025
acc01ac
refactor(supermq-docker-compose.override.yml): fix errors in files
felixgateru Mar 10, 2025
f49a7c3
refactor: add amend commit to fetch and update commands
felixgateru Mar 10, 2025
4ff230a
chore: add supermq dependency update script
felixgateru Mar 11, 2025
62e8830
chore: update SuperMQ dependency files
felixgateru Mar 11, 2025
cb56f38
fix: remove reverted changes to Makefile
felixgateru Mar 11, 2025
62468cf
refactor(supermq.sh): remove git staging and commit from script
felixgateru Mar 11, 2025
75fb2af
chore: remove redundant docker config files
felixgateru Mar 11, 2025
7a518fd
chore: remove redundant files, update compose p[roject directory
felixgateru Mar 11, 2025
8a00b18
chore: update project dir path
felixgateru Mar 11, 2025
b5ef48a
chore: update nginv env file variable, remove redundant nginx config …
felixgateru Mar 11, 2025
40d43f5
chore: include journal and certs to mg compose
felixgateru Mar 12, 2025
da41593
refactor: update script to use sparse checkout and move docker files …
felixgateru Mar 17, 2025
ef6b378
refactor: update docker compose file
felixgateru Mar 17, 2025
45a4565
feat(Makefile): add fetch_supermq to run recipe
felixgateru Mar 17, 2025
202f9fc
refactor(supermq.sh): clean up
felixgateru Mar 17, 2025
a5620b4
chore(go.mod): remove toolchain definition
felixgateru Mar 19, 2025
55b24a6
ci(build.yml): add check for supermq dependency
felixgateru Mar 19, 2025
cc83595
ci: move check to ci
felixgateru Mar 19, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check-license.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
CHECK=""
for file in $(grep -rl --exclude-dir={.git,build,**vernemq**} \
--exclude=\*.{crt,key,pem,zed,hcl,md,json,csv,mod,sum,tmpl,args} \
--exclude={CODEOWNERS,LICENSE,MAINTAINERS} \
--exclude={CODEOWNERS,LICENSE,MAINTAINERS,enabled_plugins,rabbitmq.conf} \
.); do

if ! head -n 5 "$file" | grep -q "Copyright (c) Abstract Machines"; then
Expand Down
16 changes: 13 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,17 @@ jobs:
version: v1.60.3
args: --config ./tools/config/golangci.yml

- name: Fetch supermq
run: |
make fetch_supermq
if [[ -n $(git status --porcelain docker/supermq-docker) ]]; then
echo "SuperMQ docker file is not up to date. Please update it"
git diff docker/supermq-docker
exit 1
else
exit 0
fi

- name: Build all Binaries
run: |
make all -j $(nproc)
Expand Down Expand Up @@ -162,9 +173,8 @@ jobs:
- name: Run rule engine tests
if: steps.changes.outputs.re == 'true' || steps.changes.outputs.workflow == 'true'
run: |
go test --race -v -count=1 -coverprofile=coverage/re.out ./re/...


go test --race -v -count=1 -coverprofile=coverage/re.out ./re/...

- name: Upload coverage
uses: codecov/codecov-action@v5
with:
Expand Down
5 changes: 4 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,10 @@ endif
endif
endif

run: check_certs
fetch_supermq:
@./scripts/supermq.sh

Comment on lines +249 to +251
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add this to CI, so it performs chek if there are changes in the SMQ compose is up to date.

run: check_certs fetch_supermq
docker compose -f docker/docker-compose.yml --env-file docker/.env -p $(DOCKER_PROJECT) $(DOCKER_COMPOSE_COMMAND) $(args)

run_addons: check_certs
Expand Down
Loading
Loading