Skip to content

Commit

Permalink
Fix aarch64 pipeline and update docker path in README
Browse files Browse the repository at this point in the history
  • Loading branch information
romange committed May 30, 2022
1 parent e239fc6 commit 29575d0
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 19 deletions.
33 changes: 16 additions & 17 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
name: Version Release

on:
on:
push:
tags:
- 'v*'

permissions:
contents: write

jobs:
create-release:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -39,7 +39,7 @@ jobs:
key: ${{ runner.os }}-release-deps-${{ github.sha }}
#restore-keys: |
# ${{ runner.os }}-release-deps-

- uses: uraimo/run-on-arch-action@v2
name: Run commands
id: runcmd
Expand All @@ -65,31 +65,30 @@ jobs:
--slave /usr/bin/g++ g++ /usr/bin/g++-9
run: |
cd /src
touch dockerbuild.txt
chown -R root build-opt/
ls -la build-opt/_deps/ || true
echo "now /src:"
ls -l
for i in `ls -d ./build-opt/_deps/*-src`; do
git config --global --add safe.directory $(realpath $i)
done
if [ -d build-opt ]; then
chown -R root build-opt
ls -l ./build-opt
for i in `ls -d ./build-opt/_deps/*-src`; do
git config --global --add safe.directory $(realpath $i)
done
fi
./tools/release.sh
- name: Show the artifact
# Items placed in /src/build-opt in the container will be in
# ${PWD}/build-opt on the host.
run: |
echo finished
ls -al
ls -al
- name: Upload
uses: actions/upload-artifact@v2
with:
name: dragonfly-aarch64
path: build-opt/dragonfly-*tar.gz

build-native:
runs-on: ubuntu-latest
needs: create-release
container:
container:
image: ghcr.io/romange/ubuntu-dev:20
steps:
- uses: actions/checkout@v2
Expand All @@ -103,14 +102,14 @@ jobs:
with:
name: dragonfly-amd64
path: build-opt/dragonfly-*tar.gz

publish_release:
runs-on: ubuntu-latest
needs: [build-native, build-qemu]
steps:
- uses: actions/download-artifact@v3
name: Download files
with:
name: Download files
with:
path: artifacts
- name: See all the artifacts
run: |
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,8 @@ Debian/Bullseye, Ubuntu 20.04.4 or later fit these requirements.
### With docker:

```bash
docker pull ghcr.io/dragonflydb/dragonfly && \
docker tag ghcr.io/dragonflydb/dragonfly dragonfly
docker pull docker.dragonflydb.io/dragonflydb/dragonfly && \
docker tag docker.dragonflydb.io/dragonflydb/dragonfly dragonfly

docker run --network=host --ulimit memlock=-1 --rm dragonfly

Expand Down

0 comments on commit 29575d0

Please sign in to comment.