mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-09 09:52:10 +00:00
Fix paths in release script, update crate versions (#2680)
This commit is contained in:
parent
d5368cbba9
commit
43b94e5f16
22
Cargo.lock
generated
22
Cargo.lock
generated
|
@ -2344,7 +2344,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_api"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"actix-web",
|
||||
"anyhow",
|
||||
|
@ -2370,7 +2370,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_api_common"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"actix-rt",
|
||||
"actix-web",
|
||||
|
@ -2406,7 +2406,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_api_crud"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"activitypub_federation",
|
||||
"actix-web",
|
||||
|
@ -2426,7 +2426,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_apub"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"activitypub_federation",
|
||||
"activitystreams-kinds",
|
||||
|
@ -2466,7 +2466,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_schema"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"activitypub_federation",
|
||||
"async-trait",
|
||||
|
@ -2496,7 +2496,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_views"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"diesel",
|
||||
"diesel-async",
|
||||
|
@ -2512,7 +2512,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_views_actor"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"diesel",
|
||||
"diesel-async",
|
||||
|
@ -2523,7 +2523,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_db_views_moderator"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"diesel",
|
||||
"diesel-async",
|
||||
|
@ -2533,7 +2533,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_routes"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"actix-web",
|
||||
"anyhow",
|
||||
|
@ -2558,7 +2558,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_server"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"activitypub_federation",
|
||||
"actix-rt",
|
||||
|
@ -2602,7 +2602,7 @@ dependencies = [
|
|||
|
||||
[[package]]
|
||||
name = "lemmy_utils"
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
dependencies = [
|
||||
"actix-web",
|
||||
"anyhow",
|
||||
|
|
22
Cargo.toml
22
Cargo.toml
|
@ -1,5 +1,5 @@
|
|||
[workspace.package]
|
||||
version = "0.16.5"
|
||||
version = "0.17.0"
|
||||
edition = "2021"
|
||||
description = "A link aggregator for the fediverse"
|
||||
license = "AGPL-3.0"
|
||||
|
@ -49,16 +49,16 @@ members = [
|
|||
]
|
||||
|
||||
[workspace.dependencies]
|
||||
lemmy_api = { version = "=0.16.5", path = "./crates/api" }
|
||||
lemmy_api_crud = { version = "=0.16.5", path = "./crates/api_crud" }
|
||||
lemmy_apub = { version = "=0.16.5", path = "./crates/apub" }
|
||||
lemmy_utils = { version = "=0.16.5", path = "./crates/utils" }
|
||||
lemmy_db_schema = { version = "=0.16.5", path = "./crates/db_schema" }
|
||||
lemmy_api_common = { version = "=0.16.5", path = "./crates/api_common" }
|
||||
lemmy_routes = { version = "=0.16.5", path = "./crates/routes" }
|
||||
lemmy_db_views = { version = "=0.16.5", path = "./crates/db_views" }
|
||||
lemmy_db_views_actor = { version = "=0.16.5", path = "./crates/db_views_actor" }
|
||||
lemmy_db_views_moderator = { version = "=0.16.5", path = "./crates/db_views_moderator" }
|
||||
lemmy_api = { version = "=0.17.0", path = "./crates/api" }
|
||||
lemmy_api_crud = { version = "=0.17.0", path = "./crates/api_crud" }
|
||||
lemmy_apub = { version = "=0.17.0", path = "./crates/apub" }
|
||||
lemmy_utils = { version = "=0.17.0", path = "./crates/utils" }
|
||||
lemmy_db_schema = { version = "=0.17.0", path = "./crates/db_schema" }
|
||||
lemmy_api_common = { version = "=0.17.0", path = "./crates/api_common" }
|
||||
lemmy_routes = { version = "=0.17.0", path = "./crates/routes" }
|
||||
lemmy_db_views = { version = "=0.17.0", path = "./crates/db_views" }
|
||||
lemmy_db_views_actor = { version = "=0.17.0", path = "./crates/db_views_actor" }
|
||||
lemmy_db_views_moderator = { version = "=0.17.0", path = "./crates/db_views_moderator" }
|
||||
activitypub_federation = "0.3.4"
|
||||
diesel = "2.0.2"
|
||||
diesel_migrations = "2.0.0"
|
||||
|
|
|
@ -1,8 +1,7 @@
|
|||
#!/bin/sh
|
||||
set -e
|
||||
#git checkout main
|
||||
|
||||
pushd ../docker/prod/
|
||||
|
||||
# Creating the new tag
|
||||
new_tag="$1"
|
||||
third_semver=$(echo $new_tag | cut -d "." -f 3)
|
||||
|
@ -10,6 +9,7 @@ third_semver=$(echo $new_tag | cut -d "." -f 3)
|
|||
# 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/prod/
|
||||
sed -i "s/dessalines\/lemmy:.*/dessalines\/lemmy:$new_tag/" ../prod/docker-compose.yml
|
||||
sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../prod/docker-compose.yml
|
||||
sed -i "s/dessalines\/lemmy-ui:.*/dessalines\/lemmy-ui:$new_tag/" ../dev/docker-compose.yml
|
||||
|
@ -17,6 +17,7 @@ if [ ! -z "${third_semver##*[!0-9]*}" ]; then
|
|||
git add ../prod/docker-compose.yml
|
||||
git add ../dev/docker-compose.yml
|
||||
git add ../federation/docker-compose.yml
|
||||
popd
|
||||
|
||||
# Setting the version for Ansible
|
||||
pushd ../../../lemmy-ansible
|
||||
|
@ -29,10 +30,9 @@ if [ ! -z "${third_semver##*[!0-9]*}" ]; then
|
|||
popd
|
||||
fi
|
||||
|
||||
# Update crate versions for crates.io
|
||||
pushd ../../
|
||||
old_tag=$(head -3 Cargo.toml | tail -1 | cut -d'"' -f 2)
|
||||
# same as above, for the main cargo.toml
|
||||
# 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
|
||||
|
|
Loading…
Reference in a new issue