Skip to content

Commit daf9cc0

Browse files
medavedmedaved
committed
Merge remote-tracking branch 'refs/remotes/my/master' into telegram_topics
# Conflicts: # README.md # alerting/provider/telegram/telegram.go
2 parents b9bf900 + b650518 commit daf9cc0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+5026
-2403
lines changed

‎.github/workflows/publish-experimental.yml

+9-1
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,18 @@ jobs:
1717
with:
1818
username: ${{ secrets.DOCKER_USERNAME }}
1919
password: ${{ secrets.DOCKER_PASSWORD }}
20+
- name: Docker meta
21+
id: meta
22+
uses: docker/metadata-action@v5
23+
with:
24+
images: ${{ env.IMAGE_REPOSITORY }}
25+
tags: |
26+
type=raw,value=experimental
2027
- name: Build and push Docker image
2128
uses: docker/build-push-action@v6
2229
with:
2330
platforms: linux/amd64
2431
pull: true
2532
push: true
26-
tags: ${{ env.IMAGE_REPOSITORY }}:experimental
33+
tags: ${{ steps.meta.outputs.tags }}
34+
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/publish-latest-to-ghcr.yml

-38
This file was deleted.

‎.github/workflows/publish-latest.yml

+20-2
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,34 @@ jobs:
1919
- name: Set up Docker Buildx
2020
uses: docker/setup-buildx-action@v3
2121
- name: Get image repository
22-
run: echo IMAGE_REPOSITORY=$(echo ${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
22+
run: |
23+
echo DOCKER_IMAGE_REPOSITORY=$(echo ${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
24+
echo GHCR_IMAGE_REPOSITORY=$(echo ghcr.io/${{ github.actor }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
2325
- name: Login to Docker Registry
2426
uses: docker/login-action@v3
2527
with:
2628
username: ${{ secrets.DOCKER_USERNAME }}
2729
password: ${{ secrets.DOCKER_PASSWORD }}
30+
- name: Login to GitHub Container Registry
31+
uses: docker/login-action@v3
32+
with:
33+
registry: ghcr.io
34+
username: ${{ github.actor }}
35+
password: ${{ secrets.GITHUB_TOKEN }}
36+
- name: Docker meta
37+
id: meta
38+
uses: docker/metadata-action@v5
39+
with:
40+
images: |
41+
${{ env.DOCKER_IMAGE_REPOSITORY }}
42+
${{ env.GHCR_IMAGE_REPOSITORY }}
43+
tags: |
44+
type=raw,value=latest
2845
- name: Build and push Docker image
2946
uses: docker/build-push-action@v6
3047
with:
3148
platforms: linux/amd64,linux/arm/v7,linux/arm64
3249
pull: true
3350
push: true
34-
tags: ${{ env.IMAGE_REPOSITORY }}:latest
51+
tags: ${{ steps.meta.outputs.tags }}
52+
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/publish-release-to-ghcr.yml

-37
This file was deleted.

‎.github/workflows/publish-release.yml

+22-5
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,38 @@ jobs:
1414
- name: Set up Docker Buildx
1515
uses: docker/setup-buildx-action@v3
1616
- name: Get image repository
17-
run: echo IMAGE_REPOSITORY=$(echo ${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
17+
run: |
18+
echo DOCKER_IMAGE_REPOSITORY=$(echo ${{ secrets.DOCKER_USERNAME }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
19+
echo GHCR_IMAGE_REPOSITORY=$(echo ghcr.io/${{ github.actor }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]') >> $GITHUB_ENV
1820
- name: Get the release
1921
run: echo RELEASE=${GITHUB_REF/refs\/tags\//} >> $GITHUB_ENV
2022
- name: Login to Docker Registry
2123
uses: docker/login-action@v3
2224
with:
2325
username: ${{ secrets.DOCKER_USERNAME }}
2426
password: ${{ secrets.DOCKER_PASSWORD }}
27+
- name: Login to GitHub Container Registry
28+
uses: docker/login-action@v3
29+
with:
30+
registry: ghcr.io
31+
username: ${{ github.actor }}
32+
password: ${{ secrets.GITHUB_TOKEN }}
33+
- name: Docker meta
34+
id: meta
35+
uses: docker/metadata-action@v5
36+
with:
37+
images: |
38+
${{ env.DOCKER_IMAGE_REPOSITORY }}
39+
${{ env.GHCR_IMAGE_REPOSITORY }}
40+
tags: |
41+
type=raw,value=${{ env.RELEASE }}
42+
type=raw,value=stable
43+
type=raw,value=latest
2544
- name: Build and push Docker image
2645
uses: docker/build-push-action@v6
2746
with:
2847
platforms: linux/amd64,linux/arm/v7,linux/arm64
2948
pull: true
3049
push: true
31-
tags: |
32-
${{ env.IMAGE_REPOSITORY }}:${{ env.RELEASE }}
33-
${{ env.IMAGE_REPOSITORY }}:stable
34-
${{ env.IMAGE_REPOSITORY }}:latest
50+
tags: ${{ steps.meta.outputs.tags }}
51+
labels: ${{ steps.meta.outputs.labels }}

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
# was configured by the "Set up Go" step (otherwise, it'd use sudo's "go" executable)
2929
run: sudo env "PATH=$PATH" "GOROOT=$GOROOT" go test ./... -race -coverprofile=coverage.txt -covermode=atomic
3030
- name: Codecov
31-
uses: codecov/codecov-action@v4.6.0
31+
uses: codecov/codecov-action@v5.1.2
3232
with:
3333
files: ./coverage.txt
3434
token: ${{ secrets.CODECOV_TOKEN }}

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@ node_modules
1717
*.db-shm
1818
*.db-wal
1919
gatus
20-
config/config.yml
20+
config/config.yml
21+
config.yaml

0 commit comments

Comments
 (0)