Skip to content

Commit 3c48454

Browse files
kostasrimkostasrim
committed
try
1 parent c6a9710 commit 3c48454

File tree

2 files changed

+57
-54
lines changed

2 files changed

+57
-54
lines changed

‎.github/actions/regression-tests/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131
echo "Current commit is ${{github.sha}}"
3232
pip install -r dragonfly/requirements.txt
3333
# used by PyTests
34-
export DRAGONFLY_PATH="${GITHUB_WORKSPACE}/${{build-dir-name}}/${{inputs.dfly-executable}}"
34+
export DRAGONFLY_PATH="${GITHUB_WORKSPACE}/${{inputs.build-dir-name}}/${{inputs.dfly-executable}}"
3535
export UBSAN_OPTIONS=print_stacktrace=1:halt_on_error=1 # to crash on errors
3636
3737
pytest --json-report --json-report-file=report.json -svr dragonfly --ignore=dragonfly/replication_test.py
@@ -45,7 +45,7 @@ runs:
4545
echo "Running PyTests replication test with flag: ${{ inputs.run-only-on-ubuntu-latest }}"
4646
cd ${GITHUB_WORKSPACE}/tests
4747
# used by PyTests
48-
export DRAGONFLY_PATH="${GITHUB_WORKSPACE}/${{build-dir-name}}/${{inputs.dfly-executable}}"
48+
export DRAGONFLY_PATH="${GITHUB_WORKSPACE}/${{inputs.build-dir-name}}/${{inputs.dfly-executable}}"
4949
5050
pytest --json-report --json-report-file=rep1_report.json -sv dragonfly/replication_test.py --df alsologtostderr --df enable_multi_shard_sync=true
5151
pytest --json-report --json-report-file=rep2_report.json -sv dragonfly/replication_test.py --df alsologtostderr --df enable_multi_shard_sync=false

‎.github/workflows/release.yml‎

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ name: Version Release
55
# tags:
66
# - 'v*'
77
#
8-
9-
pull_request:
10-
branches: [main]
8+
on:
9+
pull_request:
10+
branches: [main]
1111
workflow_dispatch:
1212

1313
permissions:
@@ -28,9 +28,13 @@ jobs:
2828
token: ${{ secrets.GITHUB_TOKEN }}
2929

3030
build-qemu:
31+
name: Build aarch64 on ubuntu20.04
3132
needs: create-release
33+
strategy:
34+
matrix:
35+
container: ["ubuntu-dev:20"]
36+
runner: [[self-hosted, linux, ARM64]]
3237
runs-on: ubuntu-latest
33-
runner: [ubuntu-22.04, [self-hosted, ARM64]]
3438
container:
3539
image: ghcr.io/romange/${{ matrix.container }}
3640

@@ -50,19 +54,18 @@ jobs:
5054
# ${{ runner.os }}-release-deps-
5155

5256
- name: Run commands
53-
run: |
57+
run: |
5458
# Work around https://github.com/actions/checkout/issues/766
55-
git config --global --add safe.directory /src
56-
cd /src
59+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
5760
git describe --always --tags ${{ github.sha }}
5861
59-
if [ -d build-opt ]; then
60-
chown -R root build-opt
61-
ls -l ./build-opt
62-
for i in `ls -d ./build-opt/_deps/*-src`; do
63-
git config --global --add safe.directory $(realpath $i)
64-
done
65-
fi
62+
# if [ -d build-opt ]; then
63+
# chown -R root build-opt
64+
# ls -l ./build-opt
65+
# for i in `ls -d ./build-opt/_deps/*-src`; do
66+
# git config --global --add safe.directory $(realpath $i)
67+
# done
68+
# fi
6669
./tools/release.sh
6770
./tools/packaging/generate_debian_package.sh build-opt/dragonfly-aarch64
6871
mv dragonfly_*.deb build-opt/
@@ -87,44 +90,44 @@ jobs:
8790
build-opt/dragonfly-*tar.gz
8891
build-opt/dragonfly_*.deb
8992
90-
build-native:
91-
runs-on: ubuntu-latest
92-
needs: create-release
93-
container:
94-
image: ghcr.io/romange/ubuntu-dev:20
95-
steps:
96-
- uses: actions/checkout@v3
97-
with:
98-
submodules: true
99-
- name: Configure
100-
run: |
101-
apt update && apt install -y debhelper moreutils pip jq
102-
- name: Build artifacts
103-
run: |
104-
# Work around https://github.com/actions/checkout/issues/766
105-
git config --global --add safe.directory "$GITHUB_WORKSPACE"
106-
git describe --always --tags ${{ github.sha }}
107-
./tools/release.sh
108-
# once the build is over, we want to generate a Debian package
109-
./tools/packaging/generate_debian_package.sh build-opt/dragonfly-x86_64
110-
- name: Run regression tests
111-
uses: ./.github/actions/regression-tests
112-
with:
113-
dfly-executable: dragonfly-x86_64
114-
gspace-secret: ${{ secrets.GSPACES_BOT_DF_BUILD }}
115-
run-only-on-ubuntu-latest: false
116-
build-dir-name: build-opt
117-
- name: Save artifacts
118-
run: |
119-
# place all artifacts at the same location
120-
mkdir -p results-artifacts
121-
mv build-opt/dragonfly-*tar.gz results-artifacts
122-
mv dragonfly_*.deb results-artifacts
123-
- name: Upload
124-
uses: actions/upload-artifact@v3
125-
with:
126-
name: dragonfly-amd64
127-
path: results-artifacts/*
93+
# build-native:
94+
# runs-on: ubuntu-latest
95+
# needs: create-release
96+
# container:
97+
# image: ghcr.io/romange/ubuntu-dev:20
98+
# steps:
99+
# - uses: actions/checkout@v3
100+
# with:
101+
# submodules: true
102+
# - name: Configure
103+
# run: |
104+
# apt update && apt install -y debhelper moreutils pip jq
105+
# - name: Build artifacts
106+
# run: |
107+
# # Work around https://github.com/actions/checkout/issues/766
108+
# git config --global --add safe.directory "$GITHUB_WORKSPACE"
109+
# git describe --always --tags ${{ github.sha }}
110+
# ./tools/release.sh
111+
# # once the build is over, we want to generate a Debian package
112+
# ./tools/packaging/generate_debian_package.sh build-opt/dragonfly-x86_64
113+
# - name: Run regression tests
114+
# uses: ./.github/actions/regression-tests
115+
# with:
116+
# dfly-executable: dragonfly-x86_64
117+
# gspace-secret: ${{ secrets.GSPACES_BOT_DF_BUILD }}
118+
# run-only-on-ubuntu-latest: false
119+
# build-dir-name: build-opt
120+
# - name: Save artifacts
121+
# run: |
122+
# # place all artifacts at the same location
123+
# mkdir -p results-artifacts
124+
# mv build-opt/dragonfly-*tar.gz results-artifacts
125+
# mv dragonfly_*.deb results-artifacts
126+
# - name: Upload
127+
# uses: actions/upload-artifact@v3
128+
# with:
129+
# name: dragonfly-amd64
130+
# path: results-artifacts/*
128131
# publish_release:
129132
# runs-on: ubuntu-latest
130133
# needs: [build-native, build-qemu]

0 commit comments

Comments
 (0)