Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
7476cd4
Enforce labels
dudo Jan 7, 2025
eb20273
whoops
dudo Jan 7, 2025
35ac7b4
for testing
dudo Jan 7, 2025
cbc4205
Merge branch 'main' into enforce_label
dudo Jan 7, 2025
a5df9dd
single action
dudo Jan 7, 2025
55b938d
ref
dudo Jan 7, 2025
020f0c1
write
dudo Jan 7, 2025
21f97ca
Bump version to
github-actions[bot] Jan 7, 2025
4e45fda
sed syntax
dudo Jan 7, 2025
a139b66
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 7, 2025
ffd5bb8
Bump version to
github-actions[bot] Jan 7, 2025
2bd0496
INCREMENT_LABEL
dudo Jan 7, 2025
8ee077a
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 7, 2025
3c5c339
Bump version to vv0.7.0
github-actions[bot] Jan 7, 2025
cdbce72
sed
dudo Jan 7, 2025
ecae7ae
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 7, 2025
e08b496
v
dudo Jan 7, 2025
635b09a
sed
dudo Jan 7, 2025
59529cf
sed
dudo Jan 7, 2025
156be5e
Bump version to v0.7.0
github-actions[bot] Jan 7, 2025
1e501f9
v
dudo Jan 7, 2025
b9dedb2
Bump version to v0.7.0
github-actions[bot] Jan 7, 2025
6e2ed79
bash
dudo Jan 7, 2025
791e40e
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 7, 2025
5e3258a
v
dudo Jan 7, 2025
2048b63
Bump version to 0.7.0
github-actions[bot] Jan 7, 2025
050a820
$
dudo Jan 7, 2025
aba9abb
Bump version to 0.7.0
github-actions[bot] Jan 7, 2025
58dbb03
Delete package.json.bak
dudo Jan 7, 2025
adbb8e7
remove sync
dudo Jan 7, 2025
7fe9e1a
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 7, 2025
d333a44
echo
dudo Jan 7, 2025
ae07f57
bash
dudo Jan 7, 2025
c83e9a5
echo
dudo Jan 7, 2025
a4822d2
Bump version to 1.0.0
github-actions[bot] Jan 7, 2025
64f4da6
Bump version to 0.6.2
github-actions[bot] Jan 7, 2025
a2f77e1
bash
dudo Jan 7, 2025
9ef74f1
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 7, 2025
62d7668
Bump version to 0.7.0
github-actions[bot] Jan 7, 2025
4f96ff1
bash
dudo Jan 7, 2025
3070630
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 7, 2025
79e479d
Bump version to 1.0.0
github-actions[bot] Jan 7, 2025
b2278e2
Bump version to 0.7.0
github-actions[bot] Jan 7, 2025
3e58209
Use shared workflow
dudo Jan 8, 2025
cf6500d
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 8, 2025
03e27b4
shuffle
dudo Jan 8, 2025
d736516
Bump version to 1.0.0
github-actions[bot] Jan 8, 2025
c6b7afb
Bump version to 0.6.2
github-actions[bot] Jan 8, 2025
9567ec9
shuffle
dudo Jan 8, 2025
e3b4115
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 8, 2025
d66de4f
oops
dudo Jan 8, 2025
f4d8486
Bump version to 1.0.0
github-actions[bot] Jan 8, 2025
3459b2c
lean on integration action
dudo Jan 8, 2025
7dc23e0
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 8, 2025
1ac7f49
CI
dudo Jan 8, 2025
968b02d
Bump version to 0.7.0
github-actions[bot] Jan 8, 2025
9c9b3a2
if
dudo Jan 8, 2025
dcbdd24
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 8, 2025
263f296
if
dudo Jan 8, 2025
da00189
Bump version to 1.0.0
github-actions[bot] Jan 8, 2025
21c6c50
Bump version to 0.7.0
github-actions[bot] Jan 8, 2025
dd592a1
undo
dudo Jan 8, 2025
9b0a87f
Merge branch 'enforce_label' of github.com:dudo/acme-node into enforc…
dudo Jan 8, 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
5 changes: 5 additions & 0 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,8 @@ GREETING_SERVICE_URL=localhost:50052
PERSON_SERVICE_URL=localhost:50051

OTEL_SERVICE_NAME=acme-node
OTEL_LOG_LEVEL=debug
OTEL_TRACES_EXPORTER=otlp
OTEL_METRICS_EXPORTER=none
OTEL_LOGS_EXPORTER=none
OTEL_EXPORTER_OTLP_ENDPOINT=http://jaeger:4318
10 changes: 9 additions & 1 deletion .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
- opened
- reopened
- labeled
- unlabeled
- synchronize
branches:
- main
Expand All @@ -13,7 +14,8 @@ concurrency:
cancel-in-progress: true

permissions:
contents: read
contents: write
pull-requests: write
packages: write
attestations: write
id-token: write
Expand All @@ -23,13 +25,19 @@ name: Integration

jobs:
lint:
if: ${{ !contains(fromJSON('["labeled", "unlabeled"]'), github.event.action) }}
name: Integrate
uses: gitops-ci-cd/.github/.github/workflows/lint.yaml@main

test:
if: ${{ !contains(fromJSON('["labeled", "unlabeled"]'), github.event.action) }}
name: Integrate
uses: gitops-ci-cd/.github/.github/workflows/test.yaml@main

bump:
name: Integrate
uses: gitops-ci-cd/.github/.github/workflows/bump.yaml@main

deploy:
if: github.event.action == 'labeled' && github.event.label.name == 'preview' || github.event.action == 'synchronize' && contains(github.event.pull_request.labels.*.name, 'preview')
name: Deploy
Expand Down
11 changes: 11 additions & 0 deletions compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,17 @@ services:
volumes:
- node_modules:/node_modules:cached

jaeger:
image: jaegertracing/jaeger:latest
ports:
- 16686:16686 # UI http://localhost:16686/
- 4317:4317
- 4318:4318
- 5778:5778
- 9411:9411
environment:
- LOG_LEVEL=debug

install:
<<: *npm
profiles: [tasks]
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "acme-node",
"type": "module",
"version": "0.6.1",
"version": "0.7.0",
"description": "Sample Application with developer friendly boilerplate",
"scripts": {
"start": "node ./src/index.js",
Expand Down
Loading