Skip to content

Commit 1a3d3b1

Browse files
Merge branch 'graphprotocol:main' into main
2 parents 946a6a7 + c72b379 commit 1a3d3b1

34 files changed

+14226
-465
lines changed

.github/renovate.json5

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
rebaseWhen: 'behind-base-branch',
1414
lockFileMaintenance: {
1515
enabled: true,
16+
automerge: true,
1617
},
1718
packageRules: [
1819
{
@@ -96,6 +97,11 @@
9697
'build-info-{/,}**',
9798
],
9899
},
100+
{
101+
"matchUpdateTypes": ["minor", "patch"],
102+
"matchCurrentVersion": "!/^0/",
103+
"automerge": true
104+
},
99105
],
100106
customManagers: [
101107
{

.github/workflows/containers.yml

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: Build and upload Docker image
22

33
on:
44
push:
5-
tags:
6-
- "*.*.*"
75
branches:
86
- main
97
pull_request:
@@ -14,9 +12,22 @@ env:
1412
REGISTRY: ghcr.io/${{ github.repository_owner }}
1513

1614
jobs:
17-
builds-linux:
15+
release-please:
16+
permissions:
17+
contents: write
18+
pull-requests: write
1819
runs-on: ubuntu-latest
20+
outputs:
21+
indexer-service-rs: ${{ steps.release-please.outputs.service--tag_name }}
22+
indexer-tap-agent: ${{ steps.release-please.outputs.tap-agent--tag_name }}
23+
steps:
24+
- name: Release please
25+
id: release-please
26+
uses: googleapis/release-please-action@v4
1927

28+
builds-linux:
29+
runs-on: ubuntu-latest
30+
needs: release-please
2031
strategy:
2132
matrix:
2233
target: [indexer-service-rs, indexer-tap-agent]
@@ -27,7 +38,18 @@ jobs:
2738
steps:
2839
- name: Checkout
2940
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
30-
41+
- name: Extract version from tag
42+
id: extract_version
43+
run: |
44+
TAG_NAME="${{ needs.release-please.outputs[matrix.target] }}"
45+
# Extract the version part from tags with prefix "${{ matrix.target }}-" using a regex pattern
46+
if [[ "$TAG_NAME" =~ ^${{ matrix.target }}-(.*)$ ]]; then
47+
VERSION="${BASH_REMATCH[1]}"
48+
else
49+
VERSION=""
50+
fi
51+
echo $VERSION
52+
echo "version=$VERSION" >> $GITHUB_OUTPUT
3153
- name: Docker meta
3254
id: meta
3355
uses: docker/metadata-action@8e5442c4ef9f78752691e2d8f8d19755c6f78e81 # v5
@@ -40,10 +62,10 @@ jobs:
4062
type=schedule
4163
type=ref,event=branch
4264
type=ref,event=pr
43-
type=semver,pattern={{version}}
44-
type=semver,pattern={{major}}.{{minor}}
45-
type=semver,pattern={{major}}.{{minor}}.{{patch}}
46-
type=semver,pattern={{major}}
65+
type=semver,pattern={{version}},value=${{steps.extract_version.outputs.version}}
66+
type=semver,pattern={{major}}.{{minor}},value=${{steps.extract_version.outputs.version}}
67+
type=semver,pattern={{major}}.{{minor}}.{{patch}},value=${{steps.extract_version.outputs.version}}
68+
type=semver,pattern={{major}},value=${{steps.extract_version.outputs.version}}
4769
type=sha
4870
4971
- name: Log in to the Container registry

.release-please-manifest.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"tap-agent": "1.1.1",
3+
"common": "1.1.0",
4+
"config": "1.2.0",
5+
"service": "1.1.1"
6+
}

0 commit comments

Comments
 (0)