Merge pull request #566 from logicalclocks/22.10-dev

Merging 22.10 into 24.10

.github/workflows/publish_rondb.yml

@@ -113,14 +113,13 @@ jobs:
 
           host_user="$REPO_HOPSWORKS_USER@$REPO_HOPSWORKS_HOSTNAME"
 
+          # We won't upload to repo.hops.works/master directly;
+          # This is handled by a cron job that checks whether the
+          # tarball already exists first
+          user_code_path="/home/$REPO_HOPSWORKS_USER/upload_area"
           if [ "${{ github.event_name }}" == "workflow_dispatch" ]; then
-            # Manual dispatches will only be dev tarballs
-            user_code_path="/opt/repository/master/rondb-dev"
-          else
-            # We won't upload to repo.hops.works/master directly;
-            # This is handled by a cron job that checks whether the
-            # tarball already exists first
-            user_code_path="/home/$REPO_HOPSWORKS_USER/upload_area"
+            # This will be copied to /opt/repository/master/rondb-dev
+            user_code_path="${user_code_path}/rondb-dev"            
           fi
 
           echo "Copying $tarball to $host_user:$user_code_path"