Skip to content

Commit 834f8cd

Browse files
abitmoreabitmore
authored
Merge pull request #2664 from bitshares/update-ci
Update CI configurations and Dockerfile
2 parents c275ca0 + e3568f9 commit 834f8cd

15 files changed

+30
-310
lines changed

‎.github/workflows/build-and-test.mac.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
brew install ccache
1818
brew install parallel
1919
brew install bitshares/boost/boost@1.69
20-
- uses: actions/checkout@v2
20+
- uses: actions/checkout@v3
2121
with:
2222
submodules: recursive
2323
- name: Configure
@@ -31,7 +31,7 @@ jobs:
3131
-D OPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 \
3232
..
3333
- name: Load Cache
34-
uses: actions/cache@v2
34+
uses: actions/cache@v3
3535
with:
3636
path: ccache
3737
key: ccache-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}

‎.github/workflows/build-and-test.ubuntu-debug.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
services:
1414
elasticsearch:
15-
image: docker://elasticsearch:7.17.5
15+
image: docker://elasticsearch:7.17.7
1616
options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
1717
steps:
1818
- name: Install dependencies
@@ -43,7 +43,7 @@ jobs:
4343
df -h
4444
sudo du -hs /mnt/*
4545
sudo ls -alr /mnt/
46-
- uses: actions/checkout@v2
46+
- uses: actions/checkout@v3
4747
with:
4848
submodules: recursive
4949
- name: Configure
@@ -77,7 +77,7 @@ jobs:
7777
..
7878
popd
7979
- name: Load Cache
80-
uses: actions/cache@v2
80+
uses: actions/cache@v3
8181
with:
8282
path: ccache
8383
key: ccache-debug-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}

‎.github/workflows/build-and-test.ubuntu-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
runs-on: ${{ matrix.os }}
1313
services:
1414
elasticsearch:
15-
image: docker://elasticsearch:7.17.5
15+
image: docker://elasticsearch:7.17.7
1616
options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
1717
steps:
1818
- name: Install dependencies
@@ -40,7 +40,7 @@ jobs:
4040
sudo apt-get auto-remove -y
4141
sudo apt-get clean -y
4242
df -h
43-
- uses: actions/checkout@v2
43+
- uses: actions/checkout@v3
4444
with:
4545
submodules: recursive
4646
- name: Configure
@@ -57,7 +57,7 @@ jobs:
5757
..
5858
popd
5959
- name: Load Cache
60-
uses: actions/cache@v2
60+
uses: actions/cache@v3
6161
with:
6262
path: ccache
6363
key: ccache-release-${{ matrix.os }}-${{ github.ref }}-${{ github.sha }}

‎.github/workflows/build-and-test.win.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ env:
66
# The following are for windows cross-build only:
77
BOOST_VERSION: 1_69_0
88
BOOST_DOTTED_VERSION: 1.69.0
9-
CURL_VERSION: 7.67.0
10-
OPENSSL_VERSION: 1.1.1d
9+
CURL_VERSION: 7.86.0
10+
OPENSSL_VERSION: 1.1.1q
1111
ZLIB_VERSION: 1.2.13
1212
jobs:
1313
prepare-mingw64-libs:
@@ -19,7 +19,7 @@ jobs:
1919
echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
2020
- name: Load Cache
2121
id: cache-libs
22-
uses: actions/cache@v2
22+
uses: actions/cache@v3
2323
with:
2424
path: libs
2525
key: mingw64-libs-${{ env.OS_VERSION }}-${{ env.BOOST_VERSION }}_${{ env.CURL_VERSION }}_${{ env.OPENSSL_VERSION }}_${{ env.ZLIB_VERSION }}
@@ -113,13 +113,13 @@ jobs:
113113
sudo apt-get auto-remove -y
114114
sudo apt-get clean -y
115115
df -h
116-
- uses: actions/checkout@v2
116+
- uses: actions/checkout@v3
117117
with:
118118
submodules: recursive
119119
- run: |
120120
echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
121121
- name: Load external libraries
122-
uses: actions/cache@v2
122+
uses: actions/cache@v3
123123
with:
124124
path: libs
125125
key: mingw64-libs-${{ env.OS_VERSION }}-${{ env.BOOST_VERSION }}_${{ env.CURL_VERSION }}_${{ env.OPENSSL_VERSION }}_${{ env.ZLIB_VERSION }}
@@ -143,7 +143,7 @@ jobs:
143143
-D GRAPHENE_DISABLE_UNITY_BUILD=ON \
144144
..
145145
- name: Load Cache
146-
uses: actions/cache@v2
146+
uses: actions/cache@v3
147147
with:
148148
path: ccache
149149
key: ccache-mingw64-${{ env.OS_VERSION }}-${{ github.ref }}-${{ github.sha }}

‎.github/workflows/build-docker.yml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,13 @@ jobs:
44
docker:
55
runs-on: ubuntu-latest
66
steps:
7-
- name: Inject slug/short environment variables
8-
uses: rlespinasse/github-slug-action@v3.x
97
- name: Decide whether to push to DockerHub, and set tag
108
if: |
119
github.event_name == 'push' &&
1210
( startsWith( github.ref, 'refs/tags/' ) ||
13-
contains( fromJSON('["master","develop","testnet","hardfork"]'), env.GITHUB_REF_NAME ) )
11+
contains( fromJSON('["master","develop","testnet","hardfork"]'), github.ref_name ) )
1412
run: |
15-
if [[ "${GITHUB_REF_NAME}" == "master" ]] ; then
13+
if [ "${GITHUB_REF_NAME}" == "master" ] ; then
1614
DOCKER_PUSH_TAG=latest
1715
else
1816
DOCKER_PUSH_TAG=${GITHUB_REF_NAME}
@@ -23,23 +21,23 @@ jobs:
2321
if: env.DOCKER_PUSH_TAG != ''
2422
run: echo "${DOCKER_PUSH_TAG}"
2523
- name: Checkout
26-
uses: actions/checkout@v2
24+
uses: actions/checkout@v3
2725
- name: Set up Docker Buildx
28-
uses: docker/setup-buildx-action@v1
26+
uses: docker/setup-buildx-action@v2
2927
- name: Build only
30-
uses: docker/build-push-action@v2
28+
uses: docker/build-push-action@v3
3129
with:
3230
context: .
3331
load: true
3432
- name: Login to DockerHub
3533
if: env.DOCKER_PUSH_TAG != ''
36-
uses: docker/login-action@v1
34+
uses: docker/login-action@v2
3735
with:
3836
username: ${{ secrets.DOCKERHUB_USERNAME }}
3937
password: ${{ secrets.DOCKERHUB_TOKEN }}
4038
- name: Push to DockerHub
4139
if: env.DOCKER_PUSH_TAG != ''
42-
uses: docker/build-push-action@v2
40+
uses: docker/build-push-action@v3
4341
with:
4442
context: .
4543
push: true

‎.github/workflows/sonar-scan.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ jobs:
88
name: Scan with SonarScanner
99
strategy:
1010
matrix:
11-
os: [ ubuntu-latest ]
11+
os: [ ubuntu-20.04 ]
1212
runs-on: ${{ matrix.os }}
1313
services:
1414
elasticsearch:
15-
image: docker://elasticsearch:7.17.5
15+
image: docker://elasticsearch:7.17.7
1616
options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
1717
steps:
1818
- name: Download and install latest SonarScanner CLI tool
@@ -61,7 +61,7 @@ jobs:
6161
df -h
6262
sudo du -hs /mnt/*
6363
sudo ls -alr /mnt/
64-
- uses: actions/checkout@v2
64+
- uses: actions/checkout@v3
6565
with:
6666
fetch-depth: 0
6767
submodules: recursive
@@ -103,7 +103,7 @@ jobs:
103103
- run: |
104104
echo "OS_VERSION=`lsb_release -sr`" >> $GITHUB_ENV
105105
- name: Load Cache
106-
uses: actions/cache@v2
106+
uses: actions/cache@v3
107107
with:
108108
path: |
109109
ccache

‎.travis.yml‎

Lines changed: 0 additions & 41 deletions
This file was deleted.

‎Dockerfile‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
FROM phusion/baseimage:focal-1.0.0
1+
FROM phusion/baseimage:focal-1.2.0
22
MAINTAINER The bitshares decentralized organisation
33

44
ENV LANG=en_US.UTF-8
55
RUN \
6-
apt-get update -y && \
6+
apt-get update && \
7+
apt-get upgrade -y -o Dpkg::Options::="--force-confold" && \
8+
apt-get update && \
79
apt-get install -y \
810
g++ \
911
autoconf \
@@ -53,7 +55,7 @@ RUN \
5355
install -s programs/witness_node/witness_node programs/genesis_util/get_dev_key programs/cli_wallet/cli_wallet /usr/local/bin && \
5456
#
5557
# Obtain version
56-
mkdir /etc/bitshares && \
58+
mkdir -p /etc/bitshares && \
5759
git rev-parse --short HEAD > /etc/bitshares/version && \
5860
cd / && \
5961
rm -rf /bitshares-core

‎programs/build_helpers/build_and_test‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎programs/build_helpers/build_for_cache‎

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)