Fixing release script. (#3398)

* Fixing release script.

* Version 0.18.1-rc.2

* Removing cargo update from release script.

* Fixing topdir location.

diff --git a/Cargo.lock b/Cargo.lock
index 8fe0dfc491f453389e023c2a891056bd13fcd94e..4daec1ebf5545d5c51f28e994c2059e9c8475296 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2570,7 +2570,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
 [[package]]
 name = "lemmy_api"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -2594,7 +2594,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_api_common"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "actix-web",
  "anyhow",
@@ -2623,7 +2623,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_api_crud"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "activitypub_federation",
  "actix-web",
@@ -2644,7 +2644,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_apub"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "activitypub_federation",
  "actix-web",
@@ -2682,7 +2682,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_schema"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "activitypub_federation",
  "async-trait",
@@ -2719,7 +2719,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_views"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "diesel",
  "diesel-async",
@@ -2736,7 +2736,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_views_actor"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "diesel",
  "diesel-async",
@@ -2749,7 +2749,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_db_views_moderator"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "diesel",
  "diesel-async",
@@ -2761,7 +2761,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_routes"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "activitypub_federation",
  "actix-web",
@@ -2786,7 +2786,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_server"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "activitypub_federation",
  "actix-cors",
@@ -2828,7 +2828,7 @@ dependencies = [
 
 [[package]]
 name = "lemmy_utils"
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 dependencies = [
  "actix-web",
  "anyhow",

diff --git a/Cargo.toml b/Cargo.toml
index d01e42989a42a7e00df094be066af95222ddaa71..f8dcf81b72c590f6ca3d2571a6b1f365424e397b 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.18.1-rc.1"
+version = "0.18.1-rc.2"
 edition = "2021"
 description = "A link aggregator for the fediverse"
 license = "AGPL-3.0"
@@ -49,16 +49,16 @@ members = [
 ]
 
 [workspace.dependencies]
-lemmy_api = { version = "=0.18.1-rc.1", path = "./crates/api" }
-lemmy_api_crud = { version = "=0.18.1-rc.1", path = "./crates/api_crud" }
-lemmy_apub = { version = "=0.18.1-rc.1", path = "./crates/apub" }
-lemmy_utils = { version = "=0.18.1-rc.1", path = "./crates/utils" }
-lemmy_db_schema = { version = "=0.18.1-rc.1", path = "./crates/db_schema" }
-lemmy_api_common = { version = "=0.18.1-rc.1", path = "./crates/api_common" }
-lemmy_routes = { version = "=0.18.1-rc.1", path = "./crates/routes" }
-lemmy_db_views = { version = "=0.18.1-rc.1", path = "./crates/db_views" }
-lemmy_db_views_actor = { version = "=0.18.1-rc.1", path = "./crates/db_views_actor" }
-lemmy_db_views_moderator = { version = "=0.18.1-rc.1", path = "./crates/db_views_moderator" }
+lemmy_api = { version = "=0.18.1-rc.2", path = "./crates/api" }
+lemmy_api_crud = { version = "=0.18.1-rc.2", path = "./crates/api_crud" }
+lemmy_apub = { version = "=0.18.1-rc.2", path = "./crates/apub" }
+lemmy_utils = { version = "=0.18.1-rc.2", path = "./crates/utils" }
+lemmy_db_schema = { version = "=0.18.1-rc.2", path = "./crates/db_schema" }
+lemmy_api_common = { version = "=0.18.1-rc.2", path = "./crates/api_common" }
+lemmy_routes = { version = "=0.18.1-rc.2", path = "./crates/routes" }
+lemmy_db_views = { version = "=0.18.1-rc.2", path = "./crates/db_views" }
+lemmy_db_views_actor = { version = "=0.18.1-rc.2", path = "./crates/db_views_actor" }
+lemmy_db_views_moderator = { version = "=0.18.1-rc.2", path = "./crates/db_views_moderator" }
 activitypub_federation = { version = "0.4.4", default-features = false, features = ["actix-web"] }
 diesel = "2.1.0"
 diesel_migrations = "2.1.0"

diff --git a/crates/utils/translations b/crates/utils/translations
index b3cca4b7e26dd7d9a389f75c6e50a489d93791ea..5a9d44656e2658ab7cb2dbec3fd1bfaf57654533 160000 (submodule)
--- a/crates/utils/translations
+++ b/crates/utils/translations
@@ -1 +1 @@
-Subproject commit b3cca4b7e26dd7d9a389f75c6e50a489d93791ea
+Subproject commit 5a9d44656e2658ab7cb2dbec3fd1bfaf57654533

diff --git a/scripts/release.sh b/scripts/release.sh
index 02554d5d885d60ff859c4ee9bdc742f9a157835a..76cb2dbfb507a52015e29395ff2a3418bbc5def8 100755 (executable)
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -6,10 +6,14 @@ set -e
 new_tag="$1"
 third_semver=$(echo $new_tag | cut -d "." -f 3)
 
+# Goto the upper route
+CWD="$(cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd -P)"
+cd $CWD/../
+
 # The ansible and docker installs should only update for non release-candidates
 # IE, when the third semver is a number, not '2-rc'
 if [ ! -z "${third_semver##*[!0-9]*}" ]; then
-  pushd ../docker
+  pushd docker
   sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" docker-compose.yml
   sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" docker-compose.yml
   sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" federation/docker-compose.yml
@@ -18,7 +22,7 @@ if [ ! -z "${third_semver##*[!0-9]*}" ]; then
   popd
 
   # Setting the version for Ansible
-  pushd ../../lemmy-ansible
+  pushd ../lemmy-ansible
   echo $new_tag > "VERSION"
   git add "VERSION"
   git commit -m"Updating VERSION"
@@ -29,15 +33,12 @@ if [ ! -z "${third_semver##*[!0-9]*}" ]; then
 fi
 
 # Update crate versions
-pushd ..
 old_tag=$(grep version Cargo.toml | head -1 | cut -d'"' -f 2)
 sed -i "s/{ version = \"=$old_tag\", path/{ version = \"=$new_tag\", path/g" Cargo.toml
 sed -i "s/version = \"$old_tag\"/version = \"$new_tag\"/g" Cargo.toml
 git add Cargo.toml
-cargo update
 cargo check
 git add Cargo.lock
-popd
 
 # Update the submodules
 git submodule update --remote