From 84cb4f99b14ece8cd83018eed44ff437d2c7ecc2 Mon Sep 17 00:00:00 2001 From: Chetan Tutika Date: Mon, 6 May 2024 18:03:23 +0000 Subject: [PATCH] Revert "Twitter-oss: Prepare OSS libraries for release 24.2.0" This reverts commit 996858fd593b43d101d3c546d5a9968dc5408855. There were issues with the release. Will be retrying it Differential Revision: https://phabricator.twitter.biz/D1141484 --- CHANGELOG.rst | 5 ----- README.md | 2 +- bin/build | 2 +- bin/delete-snapshots | 2 +- bin/functions | 2 +- bin/gpg-init | 2 +- bin/merge | 2 +- bin/publish | 2 +- bin/slack | 2 +- 9 files changed, 8 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index adb2baa..7303b3b 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,11 +6,6 @@ Note that ``PHAB_ID=#`` and ``RB_ID=#`` correspond to associated messages in com Unreleased ---------- -24.2.0 ------- - -No Changes - 23.11.0 ------- diff --git a/README.md b/README.md index b079e9b..f125b5e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ ## Dodo -[![Build Status](https://github.com/twitter/dodo/workflows/continuous%20integration/badge.svg?branch=release)](https://github.com/twitter/dodo/actions?query=workflow%3A%22continuous+integration%22+branch%3Arelease) +[![Build Status](https://github.com/twitter/dodo/workflows/continuous%20integration/badge.svg?branch=develop)](https://github.com/twitter/dodo/actions?query=workflow%3A%22continuous+integration%22+branch%3Adevelop) [![Project status](https://img.shields.io/badge/status-active-brightgreen.svg)](#status) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/twitter/finagle) diff --git a/bin/build b/bin/build index dc530da..c9a92be 100755 --- a/bin/build +++ b/bin/build @@ -11,7 +11,7 @@ set -euo pipefail # # See: print_usage function for usage. ####################################################################### -VERSION="24.2.0" +VERSION="23.11.0" NAME="Dodo Build" UTIL_COMMANDS="./sbt +test:compile +publishLocal" diff --git a/bin/delete-snapshots b/bin/delete-snapshots index fbabd19..e5698ac 100755 --- a/bin/delete-snapshots +++ b/bin/delete-snapshots @@ -13,7 +13,7 @@ source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/functi # NOTE: this script is expected to be run in the directory of the # project being released. ####################################################################### -VERSION="24.2.0" +VERSION="23.11.0" NAME="Dodo Snapshot Cleanup" # Validation project list in roughly "reverse" order. Start at leaves and move inward. diff --git a/bin/functions b/bin/functions index d806a75..d9c8721 100644 --- a/bin/functions +++ b/bin/functions @@ -4,7 +4,7 @@ set -euo pipefail ####################################################################### # Helper functions for Dodo Build and Publish scripts ####################################################################### -VERSION="24.2.0" +VERSION="23.11.0" NAME="Dodo Functions" # Constants diff --git a/bin/gpg-init b/bin/gpg-init index 2d35a35..b2ecfe8 100755 --- a/bin/gpg-init +++ b/bin/gpg-init @@ -10,7 +10,7 @@ source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/functi # # Does not take arguments. ####################################################################### -VERSION="24.2.0" +VERSION="23.11.0" NAME="Dodo GPG Init" # BEGIN: EXECUTE BUILD ---------------------------------------------------------------------------------- diff --git a/bin/merge b/bin/merge index 611d774..db574d1 100755 --- a/bin/merge +++ b/bin/merge @@ -11,7 +11,7 @@ source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/functi # # See: print_usage function for usage. ####################################################################### -VERSION="24.2.0" +VERSION="23.11.0" NAME="Dodo Merge Branch" WORKSPACE=${GITHUB_WORKSPACE:-.} diff --git a/bin/publish b/bin/publish index ac814b6..cc02d39 100755 --- a/bin/publish +++ b/bin/publish @@ -12,7 +12,7 @@ source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/functi # NOTE: this script is expected to be run in the directory of the # project being released. ####################################################################### -VERSION="24.2.0" +VERSION="23.11.0" NAME="Dodo Publish" # Util publishes two projects independently diff --git a/bin/slack b/bin/slack index 0fccc3d..1a949e7 100755 --- a/bin/slack +++ b/bin/slack @@ -10,7 +10,7 @@ source "$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )/functi # # See: print_usage function for usage. ####################################################################### -VERSION="24.2.0" +VERSION="23.11.0" NAME="Dodo Slack Notifications" GITHUB_LOGO="https://github.githubassets.com/images/modules/logos_page/GitHub-Mark.png?size=48"