Merge pull request #95 from Kobzol/remove-master-dependency

Remove hardcoded master references for rust-lang/rust

Author: Kobzol

local/run.sh

@@ -7,7 +7,6 @@ set -euo pipefail
 IFS=$'\n\t'
 
 RUSTC_REPO="https://github.com/rust-lang/rust"
-RUSTC_DEFAULT_BRANCH="master"
 
 # CDN to download CI artifacts from.
 DOWNLOAD_BASE="https://ci-artifacts.rust-lang.org/rustc-builds"
@@ -47,17 +46,17 @@ override_commit="$2"
 
 # Nightly is on the default branch
 if [[ "${channel}" = "nightly" ]]; then
-    branch="${RUSTC_DEFAULT_BRANCH}"
+    branch="HEAD"
 else
-    branch="${channel}"
+    branch="refs/heads/${channel}"
 fi
 
 echo "==> overriding files to force promote-release to run"
 mc cp "/src/local/channel-rust-${channel}.toml" "local/static/dist/channel-rust-${channel}.toml" >/dev/null
 
 if [[ "${override_commit}" = "" ]]; then
     echo "==> detecting the last rustc commit on branch ${branch}"
-    commit="$(git ls-remote "${RUSTC_REPO}" | grep "refs/heads/${branch}" | awk '{print($1)}')"
+    commit="$(git ls-remote "${RUSTC_REPO}" "${branch}" | awk '{print($1)}')"
 else
     echo "=>> using overridden commit ${override_commit}"
     commit="${override_commit}"

src/branching.rs

@@ -18,7 +18,8 @@ impl Context {
             return Ok(());
         };
         let mut token = github.token("rust-lang/rust")?;
-        let bump_commit = branchpoint(&mut token, "master")?;
+        let repo = token.repository()?;
+        let bump_commit = branchpoint(&mut token, &repo.default_branch)?;
         let prebump_sha = bump_commit.parents[0].sha.clone();
         let beta_sha = token.get_ref("heads/beta")?;
 

src/github.rs

@@ -411,6 +411,19 @@ impl RepositoryClient<'_> {
         self.client.without_body().send_with_response::<GitFile>()
     }
 
+    /// Returns information about the current repository
+    pub(crate) fn repository(&mut self) -> anyhow::Result<Repository> {
+        self.start_new_request()?;
+        self.client.get(true)?;
+        self.client.url(&format!(
+            "https://api.github.com/repos/{repo}",
+            repo = self.repo,
+        ))?;
+        self.client
+            .without_body()
+            .send_with_response::<Repository>()
+    }
+
     pub(crate) fn merge_pr(&mut self, pr: u32) -> anyhow::Result<()> {
         self.start_new_request()?;
         self.client.put(true)?;
@@ -496,6 +509,11 @@ impl GitFile {
     }
 }
 
+#[derive(Debug, serde::Deserialize)]
+pub(crate) struct Repository {
+    pub(crate) default_branch: String,
+}
+
 #[derive(Copy, Clone)]
 pub(crate) struct CreateTag<'a> {
     pub(crate) commit: &'a str,

src/main.rs

@@ -104,12 +104,6 @@ impl Context {
             return Ok(commit);
         }
 
-        let git_ref = match self.config.channel {
-            Channel::Nightly => "refs/heads/master",
-            Channel::Beta => "refs/heads/beta",
-            Channel::Stable => "refs/heads/stable",
-        };
-
         // git2 requires a git repository to be able to connect to a remote and fetch metadata, so
         // this creates an empty repository in a temporary directory. It will be deleted once the
         // function returns.
@@ -119,6 +113,12 @@ impl Context {
         let mut remote = repo.remote("origin", &self.config.repository)?;
         remote.connect(git2::Direction::Fetch)?;
 
+        let git_ref = match self.config.channel {
+            Channel::Nightly => remote.default_branch()?.as_str().unwrap().to_string(),
+            Channel::Beta => "refs/heads/beta".to_string(),
+            Channel::Stable => "refs/heads/stable".to_string(),
+        };
+
         for head in remote.list()? {
             if head.name() == git_ref {
                 return Ok(hex::encode(head.oid().as_bytes()));