- tor-commits - lists.torproject.org

[tor/maint-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit ae92a92453eb3a0248cb20b153fe35e8cdc608cc Merge: d4af7bdb26 14385ce71e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:49 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 61aed5200c89ebafb2db6330a52f9c34d674f294 Merge: 90a74a2ea8 ae92a92453 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:49 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit ae92a92453eb3a0248cb20b153fe35e8cdc608cc Merge: d4af7bdb26 14385ce71e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:49 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.4.6] ci: Missing source dir when parsing configure.ac version
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:31 2021 -0400 ci: Missing source dir when parsing configure.ac version Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 67a95a1f61..f99e45e6f2 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -287,7 +287,7 @@ fi ############################################################################# # Determine the version of Tor. -TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;') +TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; s/\].*//;') # Use variables like these when we need to behave differently depending on # Tor version. Only create the variables we need.

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit e51b25c02d44b8ff7f6b84951e0cd90cc100589c Merge: e33c6717b8 14385ce71e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:48 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.5] Merge branch 'maint-0.3.5' into maint-0.4.5
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit ae92a92453eb3a0248cb20b153fe35e8cdc608cc Merge: d4af7bdb26 14385ce71e Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:49 2021 -0400 Merge branch 'maint-0.3.5' into maint-0.4.5 scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.5] ci: Missing source dir when parsing configure.ac version
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:31 2021 -0400 ci: Missing source dir when parsing configure.ac version Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 67a95a1f61..f99e45e6f2 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -287,7 +287,7 @@ fi ############################################################################# # Determine the version of Tor. -TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;') +TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; s/\].*//;') # Use variables like these when we need to behave differently depending on # Tor version. Only create the variables we need.

1 0

[tor/release-0.3.5] ci: Missing source dir when parsing configure.ac version
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:31 2021 -0400 ci: Missing source dir when parsing configure.ac version Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 67a95a1f61..f99e45e6f2 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -287,7 +287,7 @@ fi ############################################################################# # Determine the version of Tor. -TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;') +TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; s/\].*//;') # Use variables like these when we need to behave differently depending on # Tor version. Only create the variables we need.

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 19b6196f675c4ba743f08a703751b802229545a7 Merge: 4deffa907e ae92a92453 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:49 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.4.6] ci: Missing source dir when parsing configure.ac version
by dgoulet＠torproject.org 26 Oct '21

26 Oct '21

commit 14385ce71e1d7bddc671d3805d3b7dcb17eeded9 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Oct 26 14:33:31 2021 -0400 ci: Missing source dir when parsing configure.ac version Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/ci/ci-driver.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 67a95a1f61..f99e45e6f2 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -287,7 +287,7 @@ fi ############################################################################# # Determine the version of Tor. -TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 's/.*\[//; s/\].*//;') +TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; s/\].*//;') # Use variables like these when we need to behave differently depending on # Tor version. Only create the variables we need.

1 0