Compare commits
No commits in common. "dd658be7ef5c021d9250378133b4c650b599dcaf" and "16d7f4b52fc65e2add66292f5ce8cdad24f4c3d5" have entirely different histories.
dd658be7ef
...
16d7f4b52f
@ -3,12 +3,12 @@ name: ci
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- "*"
|
||||
- 'main'
|
||||
tags:
|
||||
- "*"
|
||||
- '*'
|
||||
pull_request:
|
||||
branches:
|
||||
- "main"
|
||||
- 'main'
|
||||
|
||||
jobs:
|
||||
docker:
|
||||
@ -18,7 +18,6 @@ jobs:
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Docker meta
|
||||
id: meta
|
||||
uses: docker/metadata-action@v5
|
||||
@ -30,19 +29,17 @@ jobs:
|
||||
type=ref,event=pr
|
||||
type=semver,pattern={{version}}
|
||||
type=semver,pattern={{major}}.{{minor}}
|
||||
|
||||
- name: Login to registry
|
||||
if: github.ref_type == 'tag'
|
||||
- name: Login to DockerHub
|
||||
if: github.event_name != 'pull_request'
|
||||
uses: docker/login-action@v3
|
||||
with:
|
||||
registry: git.sebclem.fr
|
||||
username: ${{ secrets.DOCKERHUB_USERNAME }}
|
||||
password: ${{ secrets.DOCKERHUB_TOKEN }}
|
||||
|
||||
- name: Build and push
|
||||
uses: docker/build-push-action@v5
|
||||
with:
|
||||
context: .
|
||||
push: ${{ github.ref_type == 'tag' }}
|
||||
push: ${{ github.event_name != 'pull_request' }}
|
||||
tags: ${{ steps.meta.outputs.tags }}
|
||||
labels: ${{ steps.meta.outputs.labels }}
|
@ -54,7 +54,7 @@ def prom_exporter():
|
||||
response.append('#HELP '+attribute+' '+info['help'])
|
||||
response.append('#TYPE '+attribute+' '+info['type'])
|
||||
response.append(attribute+'{'+info['device']+'} '+info['value'])
|
||||
client.user.logout()
|
||||
|
||||
return '\n'.join(response)
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user