Skip to content

Commit

Permalink
Merge branch 'v0.17.x'
Browse files Browse the repository at this point in the history
  • Loading branch information
Krekeler committed May 14, 2022
2 parents 68b3532 + ab5d7c1 commit 90731ae
Show file tree
Hide file tree
Showing 1,449 changed files with 173,450 additions and 68,285 deletions.
3 changes: 0 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1 @@
* text=auto
*.ts text

src/clientversion.cpp export-subst
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

This issue tracker is only for technical issues related to DMS Core.

To report critical security issues, email [email protected]

### Describe the issue

### Can you reliably reproduce the issue?
Expand Down
73 changes: 73 additions & 0 deletions .github/workflows/release_docker_hub.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
name: Release to Docker Hub

on:
release:
types: [published]

jobs:
release:
name: Release to Docker Hub
runs-on: ubuntu-20.04
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up QEMU
uses: docker/setup-qemu-action@v1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1

- name: Cache Docker layers
uses: actions/cache@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Docker meta
id: docker_meta
uses: crazy-max/ghaction-docker-meta@v2
with:
images: documentchain/dmsd
tags: |
type=match,pattern=v(\d+.\d+.\d+.\d+),group=1,enable=${{ !contains(github.event.release.tag_name, '-rc') }}
type=match,pattern=v(\d+.\d+.\d+),group=1,enable=${{ !contains(github.event.release.tag_name, '-rc') }}
type=match,pattern=v(\d+.\d+),group=1,enable=${{ !contains(github.event.release.tag_name, '-rc') }}
type=raw,value=latest,enable=${{ !contains(github.event.release.tag_name, '-rc') }}
type=match,pattern=v(.*),group=1,latest=false,enable=${{ contains(github.event.release.tag_name, '-rc') }}
type=raw,value=latest-dev,enable=${{ contains(github.event.release.tag_name, '-rc') }}
flavor: |
latest=false
- name: Build and push
id: docker_build
uses: docker/build-push-action@v2
with:
context: ./docker
file: ./docker/Dockerfile.GitHubActions
push: true
tags: ${{ steps.docker_meta.outputs.tags }}
labels: ${{ steps.docker_meta.outputs.labels }}
build-args: TAG=${{ steps.docker_meta.outputs.version }}
cache-from: type=local,src=/tmp/.buildx-cache
cache-to: type=local,dest=/tmp/.buildx-cache-new
platforms: linux/amd64,linux/arm64,linux/arm/v7

- # Temp fix
# https://github.com/docker/build-push-action/issues/252
# https://github.com/moby/buildkit/issues/1896
name: Move cache
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
16 changes: 11 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ src/dmsd
src/dms-cli
src/dms-tx
src/test/test_dms
src/test/test_dms_fuzzy
src/qt/test/test_dms-qt
src/qt/res/css/colors/*
src/bench/bench_dms

# autoreconf
Expand Down Expand Up @@ -63,8 +65,6 @@ libconftest.dylib*
*.pyc
*.o
*.o-*
*.patch
!depends/patches/*/*.patch
*.a
*.pb.cc
*.pb.h
Expand All @@ -76,6 +76,10 @@ libconftest.dylib*
*.json.h
*.raw.h

# Only ignore unexpected patches
*.patch
!depends/patches/**/*.patch

#libtool object files
*.lo
*.la
Expand All @@ -85,18 +89,20 @@ libconftest.dylib*
Makefile
dms-qt
DMS-Qt.app
background.tiff*
!/depends/Makefile

# Unit-tests
Makefile.test
dms-qt_test
src/test/buildenv.py

# Resources cpp
qrc_*.cpp

# Mac specific
.DS_Store
build
*.dSYM

#lcov
*.gcno
Expand All @@ -110,8 +116,8 @@ coverage_percent.txt
linux-coverage-build
linux-build
win32-build
qa/pull-tester/tests_config.py
qa/cache/*
test/config.ini
test/cache/*

!src/leveldb*/Makefile

Expand Down
Loading

0 comments on commit 90731ae

Please sign in to comment.