Merge branch 'next' into remove_apt_key_calls

scylladb · Oct 1, 2023 · 491d75c · 491d75c
2 parents 7119257 + 17f40ab
commit 491d75c
Show file tree

Hide file tree

Showing 22 changed files with 582 additions and 1,171 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Setup python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: 3.8                         
           architecture: x64
@@ -30,7 +30,7 @@ jobs:
         run: docker run -v `pwd`:/scylla-machine-image -w /scylla-machine-image  --rm centos:7.2.1511 bash -c './dist/redhat/build_rpm.sh -t centos7'
 
       - name: Build RPM (Rockylinux:8)
-        run: docker run -v `pwd`:/scylla-machine-image -w /scylla-machine-image  --rm rockylinux:8 bash -c './dist/redhat/build_rpm.sh -t centos8'
+        run: docker run -v `pwd`:/scylla-machine-image -w /scylla-machine-image  --rm rockylinux:8 bash -c 'dnf update -y; dnf install -y git ; git config --global --add safe.directory "*"; ./dist/redhat/build_rpm.sh -t centos8'
 
-      - name: Build DEB (Ubuntu:20.04)
-        run: docker run -v `pwd`:/scylla-machine-image -w /scylla-machine-image  --rm ubuntu:20.04 bash -c 'apt update -y; apt install -y git ; git config --global --add safe.directory "*"; ./dist/debian/build_deb.sh'
+      - name: Build DEB (Ubuntu:22.04)
+        run: docker run -v `pwd`:/scylla-machine-image -w /scylla-machine-image  --rm ubuntu:22.04 bash -c 'apt update -y; apt install -y git ; git config --global --add safe.directory "*"; ./dist/debian/build_deb.sh'
diff --git a/.gitignore b/.gitignore
@@ -1 +1,4 @@
-build
+build
+__pycache__
+.venv
+
diff --git a/SCYLLA-VERSION-GEN b/SCYLLA-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 PRODUCT=scylla
-VERSION=5.2.0-dev
+VERSION=5.4.0-dev
 
 if test -f version
 then