Skip to content

Commit 0a98622

Browse files
committed
Upgraded events consumer to go 1.26 and improved dev workflow files
1 parent fd995d0 commit 0a98622

6 files changed

Lines changed: 59 additions & 28 deletions

File tree

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,33 @@
1-
name: Deploy bob-events-bridge prod images to GHCR
1+
name: Create bob events bridge dev image
22

33
on:
44
push:
55
branches:
6-
- 25-bob-events-bridge-add-last-log-flag
6+
- 33-oracle-log-types
77
paths:
88
- 'bob-events-bridge/**'
9+
- '.github/workflows/push-docker-bob-events-bridge-dev.yaml'
910

1011
jobs:
12+
test:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Checkout code
16+
uses: actions/checkout@v4
17+
18+
- name: Set up Go
19+
uses: actions/setup-go@v4
20+
with:
21+
go-version: 1.26.x
22+
cache: false
23+
24+
- name: Run tests
25+
run: go test -p 1 -tags ci ./...
26+
working-directory: bob-events-bridge
27+
1128
docker-publish:
1229
runs-on: ubuntu-latest
30+
needs: test
1331

1432
permissions:
1533
contents: read
@@ -29,19 +47,10 @@ jobs:
2947
username: ${{ github.actor }}
3048
password: ${{ secrets.GITHUB_TOKEN }}
3149

32-
- name: Extract module and version from tag
33-
id: extract
34-
run: |
35-
TAG=${GITHUB_REF#refs/tags/}
36-
MODULE_NAME=$(echo "$TAG" | cut -d/ -f1)
37-
VERSION=$(echo "$TAG" | cut -d/ -f2)
38-
echo "module=$MODULE_NAME" >> $GITHUB_OUTPUT
39-
echo "version=$VERSION" >> $GITHUB_OUTPUT
40-
4150
- name: Build and push Docker image
4251
uses: docker/build-push-action@v5
4352
with:
4453
context: ./bob-events-bridge
4554
file: ./bob-events-bridge/Dockerfile
4655
push: true
47-
tags: ghcr.io/qubic/bob-events-bridge:25-bob-events-bridge-add-last-log-flag
56+
tags: ghcr.io/qubic/bob-events-bridge:33-oracle-log-types

.github/workflows/push-docker-log-events-consumer-branch.yml renamed to .github/workflows/push-docker-log-events-consumer-dev.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
name: Create log events consumer image (branch)
1+
name: Create log events consumer dev image
22

33
on:
44
push:
55
branches:
6-
- 'feature/publish-ingestion-status'
6+
- '33-oracle-log-types'
77
paths:
88
- 'log-events-consumer/**'
9-
- '.github/workflows/push-docker-log-events-consumer-branch.yml'
9+
- '.github/workflows/push-docker-log-events-consumer-dev.yml'
1010

1111
jobs:
1212
test:
@@ -18,7 +18,7 @@ jobs:
1818
- name: Set up Go
1919
uses: actions/setup-go@v4
2020
with:
21-
go-version: 1.25.x
21+
go-version: 1.26.x
2222
cache: false
2323

2424
- name: Run tests
@@ -47,16 +47,10 @@ jobs:
4747
username: ${{ github.actor }}
4848
password: ${{ secrets.GITHUB_TOKEN }}
4949

50-
- name: Extract branch name
51-
id: extract
52-
run: |
53-
BRANCH_NAME=${GITHUB_REF#refs/heads/}
54-
echo "branch=$BRANCH_NAME" >> $GITHUB_OUTPUT
55-
5650
- name: Build and push Docker image
5751
uses: docker/build-push-action@v5
5852
with:
5953
context: ./log-events-consumer
6054
file: ./log-events-consumer/Dockerfile
6155
push: true
62-
tags: ghcr.io/qubic/log-events-consumer:snapshot
56+
tags: ghcr.io/qubic/log-events-consumer:33-oracle-log-types

.github/workflows/push-docker-log-events-consumer.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Set up Go
1616
uses: actions/setup-go@v4
1717
with:
18-
go-version: 1.25.x
18+
go-version: 1.26.x
1919
cache: false
2020

2121
- name: Run tests

.github/workflows/test-log-events-consumer.yml

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,17 @@ on:
66
paths:
77
- 'log-events-consumer/**'
88

9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
913
name: Test log events consumer
1014

1115
jobs:
1216
test-nocache:
1317
strategy:
1418
matrix:
15-
go-version: [1.25.x]
19+
go-version: [1.26.x]
1620
os: [ubuntu-latest]
1721
runs-on: ${{ matrix.os }}
1822
steps:
@@ -22,4 +26,28 @@ jobs:
2226
go-version: ${{ matrix.go-version }}
2327
cache: false
2428
- run: go test -p 1 -tags ci ./...
25-
working-directory: log-events-consumer
29+
working-directory: log-events-consumer
30+
lint:
31+
name: Lint log events consumer
32+
runs-on: ubuntu-latest
33+
steps:
34+
- uses: actions/checkout@v3
35+
- name: Set up Go
36+
uses: actions/setup-go@v4
37+
with:
38+
go-version: 1.26.x
39+
- name: Run golangci-lint
40+
uses: golangci/golangci-lint-action@v8
41+
with:
42+
version: v2.9
43+
working-directory: log-events-consumer
44+
govulncheck:
45+
runs-on: ubuntu-latest
46+
name: Run govulncheck v2
47+
steps:
48+
- id: govulncheck
49+
uses: golang/govulncheck-action@v1
50+
with:
51+
go-version-input: '1.26'
52+
go-package: ./...
53+
work-dir: log-events-consumer

log-events-consumer/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25 AS builder
1+
FROM golang:1.26 AS builder
22
ENV CGO_ENABLED=0
33

44
WORKDIR /src/log-events-consumer

log-events-consumer/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/qubic/log-events-consumer
22

3-
go 1.25.7
3+
go 1.26
44

55
require (
66
github.com/Bose/minisentinel v0.0.0-20200130220412-917c5a9223bb

0 commit comments

Comments
 (0)