Skip to content
This repository was archived by the owner on Feb 24, 2021. It is now read-only.

Commit e2855ce

Browse files
Merge master into dependabot/npm_and_yarn/master/material-design-icons-iconfont-6.1.0
2 parents c196702 + 6207dc4 commit e2855ce

File tree

3 files changed

+61
-43
lines changed

3 files changed

+61
-43
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,15 @@ updates:
1919
labels:
2020
- 'dev-dependencies'
2121
- 'automerge'
22+
23+
- package-ecosystem: 'docker' # See documentation for possible values
24+
directory: '/docker'
25+
schedule:
26+
interval: 'daily'
27+
labels:
28+
- 'automerge'
29+
30+
- package-ecosystem: 'github-actions'
31+
directory: '/'
32+
schedule:
33+
interval: 'daily'

.github/workflows/close-stale.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: 'Close stale issues'
2+
on:
3+
schedule:
4+
- cron: '0 0 * * *'
5+
6+
jobs:
7+
stale:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/stale@v3
11+
with:
12+
repo-token: ${{ secrets.GITHUB_TOKEN }}
13+
stale-issue-message: 'This issue is stale because it has been open 90 days with no activity. Remove the stale label or comment or this will be closed in 5 days. To ignore this issue entirely you can add the no-stale label'
14+
close-issue-message: 'This issue is now closed due to inactivity, you can of course reopen or reference this issue if you see fit.'
15+
stale-pr-message: 'This pull-request is stale because it has been open 90 days with no activity. Remove the stale label or comment or this will be closed in 5 days. To ignore this pull-request entirely you can add the no-stale label'
16+
close-pr-message: 'This pull-request is now closed due to inactivity, you can of course reopen or reference this pull-request if you see fit.'
17+
days-before-stale: 90
18+
days-before-close: 5
19+
exempt-issue-labels: 'no-stale,enhancement'
20+
exempt-pr-labels: 'no-stale'

.github/workflows/dockerbuild.yml

Lines changed: 29 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -14,51 +14,37 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
17-
- uses: crazy-max/ghaction-docker-buildx@v3
18-
19-
- name: Prepare
20-
id: prepare
21-
run: |
22-
DOCKER_IMAGE=robertslando/zwave2mqtt
23-
DOCKER_PLATFORMS=linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386
24-
25-
echo ::set-output name=docker_image::${DOCKER_IMAGE}
26-
echo ::set-output name=docker_platforms::${DOCKER_PLATFORMS} \
27-
28-
- name: Just build on PR
29-
if: ${{ github.event_name == 'pull_request' }}
30-
run: |
31-
docker buildx build \
32-
-f docker/Dockerfile \
33-
--platform ${{ steps.prepare.outputs.docker_platforms }} \
34-
-t ${{ steps.prepare.outputs.docker_image }}:dev \
35-
.
3617

18+
- uses: docker/setup-buildx-action@v1
19+
- uses: docker/setup-qemu-action@v1
3720
- name: Login to dockerhub
3821
if: ${{ github.event_name != 'pull_request' }}
39-
run: |
40-
docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD
41-
env:
42-
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
43-
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
22+
uses: docker/login-action@v1
23+
with:
24+
username: ${{ secrets.DOCKER_USERNAME }}
25+
password: ${{ secrets.DOCKER_PASSWORD }}
4426

45-
- name: Dev
46-
if: ${{ github.ref == 'refs/heads/master'}}
47-
run: |
48-
docker buildx build \
49-
-f docker/Dockerfile \
50-
--platform ${{ steps.prepare.outputs.docker_platforms }} \
51-
-t ${{ steps.prepare.outputs.docker_image }}:dev \
52-
--push \
53-
.
54-
55-
- name: Latest & tag
56-
if: ${{ github.event_name == 'release' }}
27+
- name: Prepare
5728
run: |
58-
docker buildx build \
59-
-f docker/Dockerfile \
60-
--platform ${{ steps.prepare.outputs.docker_platforms }} \
61-
-t ${{ steps.prepare.outputs.docker_image }}:$(echo ${GITHUB_REF} | sed "s/refs\/tags\/v//") \
62-
-t ${{ steps.prepare.outputs.docker_image }}:latest \
63-
--push \
64-
.
29+
DOCKER_REPO=robertslando/zwave2mqtt
30+
if [ "$GITHUB_REF" == "refs/heads/master" ]; then
31+
TAGS="${DOCKER_REPO}:dev\n"
32+
fi
33+
if [ "$GITHUB_EVENT_NAME" == "release" ]; then
34+
TAGS="${TAGS}${DOCKER_REPO}:latest\n"
35+
TAGS="${TAGS}${DOCKER_REPO}:$(echo ${GITHUB_REF} | sed "s/refs\/tags\/v//")\n"
36+
fi
37+
38+
TAGS="${TAGS}${DOCKER_REPO}:sha-${GITHUB_SHA}"
39+
40+
echo TAGS="${TAGS}" >> $GITHUB_ENV
41+
echo DOCKER_REPO="${DOCKER_REPO}" >> $GITHUB_ENV
42+
43+
- name: build+push
44+
uses: docker/build-push-action@v2
45+
with:
46+
cache-from: type=registry,ref=${{ env.DOCKER_REPO }}:sha-${{ env.GITHUB_SHA }}
47+
platforms: linux/arm64,linux/amd64,linux/arm/v6,linux/arm/v7,linux/386
48+
file: docker/Dockerfile
49+
push: ${{ github.event_name != 'pull_request' }}
50+
tags: ${{ env.TAGS }}

0 commit comments

Comments
 (0)