grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixing release script. (#3398)

Browse source 
* Fixing release script.

* Version 0.18.1-rc.2

* Removing cargo update from release script.

* Fixing topdir location.
This commit is contained in:
Dessalines 2023-06-29 10:17:59 -04:00 committed by GitHub
parent 0464c46d26
commit 6c64cb5233
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Cargo.lock generated
View file

@ -2570,7 +2570,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "lemmy_api" name = "lemmy_api"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"anyhow", "anyhow",
@ -2594,7 +2594,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_api_common" name = "lemmy_api_common"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"anyhow", "anyhow",
@ -2623,7 +2623,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_api_crud" name = "lemmy_api_crud"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"actix-web", "actix-web",
@ -2644,7 +2644,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_apub" name = "lemmy_apub"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"actix-web", "actix-web",
@ -2682,7 +2682,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_schema" name = "lemmy_db_schema"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"async-trait", "async-trait",
@ -2719,7 +2719,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_views" name = "lemmy_db_views"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"diesel", "diesel",
"diesel-async", "diesel-async",
@ -2736,7 +2736,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_views_actor" name = "lemmy_db_views_actor"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"diesel", "diesel",
"diesel-async", "diesel-async",
@ -2749,7 +2749,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_db_views_moderator" name = "lemmy_db_views_moderator"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"diesel", "diesel",
"diesel-async", "diesel-async",
@ -2761,7 +2761,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_routes" name = "lemmy_routes"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"actix-web", "actix-web",
@ -2786,7 +2786,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_server" name = "lemmy_server"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"activitypub_federation", "activitypub_federation",
"actix-cors", "actix-cors",
@ -2828,7 +2828,7 @@ dependencies = [
[[package]] [[package]]
name = "lemmy_utils" name = "lemmy_utils"
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
dependencies = [ dependencies = [
"actix-web", "actix-web",
"anyhow", "anyhow",

22
Cargo.toml
View file

@ -1,5 +1,5 @@
[workspace.package] [workspace.package]
version = "0.18.1-rc.1" version = "0.18.1-rc.2"
edition = "2021" edition = "2021"
description = "A link aggregator for the fediverse" description = "A link aggregator for the fediverse"
license = "AGPL-3.0" license = "AGPL-3.0"
@ -49,16 +49,16 @@ members = [
] ]
[workspace.dependencies] [workspace.dependencies]
lemmy_api = { version = "=0.18.1-rc.1", path = "./crates/api" } lemmy_api = { version = "=0.18.1-rc.2", path = "./crates/api" }
lemmy_api_crud = { version = "=0.18.1-rc.1", path = "./crates/api_crud" } lemmy_api_crud = { version = "=0.18.1-rc.2", path = "./crates/api_crud" }
lemmy_apub = { version = "=0.18.1-rc.1", path = "./crates/apub" } lemmy_apub = { version = "=0.18.1-rc.2", path = "./crates/apub" }
lemmy_utils = { version = "=0.18.1-rc.1", path = "./crates/utils" } lemmy_utils = { version = "=0.18.1-rc.2", path = "./crates/utils" }
lemmy_db_schema = { version = "=0.18.1-rc.1", path = "./crates/db_schema" } lemmy_db_schema = { version = "=0.18.1-rc.2", path = "./crates/db_schema" }
lemmy_api_common = { version = "=0.18.1-rc.1", path = "./crates/api_common" } lemmy_api_common = { version = "=0.18.1-rc.2", path = "./crates/api_common" }
lemmy_routes = { version = "=0.18.1-rc.1", path = "./crates/routes" } lemmy_routes = { version = "=0.18.1-rc.2", path = "./crates/routes" }
lemmy_db_views = { version = "=0.18.1-rc.1", path = "./crates/db_views" } lemmy_db_views = { version = "=0.18.1-rc.2", path = "./crates/db_views" }
lemmy_db_views_actor = { version = "=0.18.1-rc.1", path = "./crates/db_views_actor" } lemmy_db_views_actor = { version = "=0.18.1-rc.2", path = "./crates/db_views_actor" }
lemmy_db_views_moderator = { version = "=0.18.1-rc.1", path = "./crates/db_views_moderator" } 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"] } activitypub_federation = { version = "0.4.4", default-features = false, features = ["actix-web"] }
diesel = "2.1.0" diesel = "2.1.0"
diesel_migrations = "2.1.0" diesel_migrations = "2.1.0"

2
crates/utils/translations

@ -1 +1 @@
Subproject commit b3cca4b7e26dd7d9a389f75c6e50a489d93791ea Subproject commit 5a9d44656e2658ab7cb2dbec3fd1bfaf57654533

11
scripts/release.sh
View file

@ -6,10 +6,14 @@ set -e
new_tag="$1" new_tag="$1"
third_semver=$(echo $new_tag | cut -d "." -f 3) 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 # The ansible and docker installs should only update for non release-candidates
# IE, when the third semver is a number, not '2-rc' # IE, when the third semver is a number, not '2-rc'
if [ ! -z "${third_semver##*[!0-9]*}" ]; then 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:.*/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/" docker-compose.yml
sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" federation/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 popd
# Setting the version for Ansible # Setting the version for Ansible
pushd ../../lemmy-ansible pushd ../lemmy-ansible
echo $new_tag > "VERSION" echo $new_tag > "VERSION"
git add "VERSION" git add "VERSION"
git commit -m"Updating VERSION" git commit -m"Updating VERSION"
@ -29,15 +33,12 @@ if [ ! -z "${third_semver##*[!0-9]*}" ]; then
fi fi
# Update crate versions # Update crate versions
pushd ..
old_tag=$(grep version Cargo.toml | head -1 | cut -d'"' -f 2) 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\", path/{ version = \"=$new_tag\", path/g" Cargo.toml
sed -i "s/version = \"$old_tag\"/version = \"$new_tag\"/g" Cargo.toml sed -i "s/version = \"$old_tag\"/version = \"$new_tag\"/g" Cargo.toml
git add Cargo.toml git add Cargo.toml
cargo update
cargo check cargo check
git add Cargo.lock git add Cargo.lock
popd
# Update the submodules # Update the submodules
git submodule update --remote git submodule update --remote