Prefix dev builds with dev instead of nightly

Author: maciektr

.github/workflows/_build-release.yml

@@ -94,8 +94,8 @@ jobs:
       - name: Build
         run: |
             ${{ env.CARGO }} build --release --locked --target ${{ matrix.target }} --workspace --exclude scarb-prove \
-          --exclude scarb-verify ${{ inputs.include-cairols && '--exclude scarb-cairo-language-server' || ''}} \
-          --no-default-features ${{ inputs.include-lint && '--features scarb/scarb-lint' || ''}}
+            --exclude scarb-verify ${{ inputs.include-cairols && '--exclude scarb-cairo-language-server' || ''}} \
+            --no-default-features ${{ inputs.include-lint && '--features scarb/scarb-lint' || ''}}
 
       - uses: dtolnay/rust-toolchain@master
         if: inputs.include-stwo

.github/workflows/dev-build.yml

@@ -42,4 +42,5 @@ jobs:
       #upgrade_stwo: ${{ inputs.upgrade_stwo }}
       include-cairols: ${{ inputs.include-cairols }}
       include-stwo: ${{ inputs.include-stwo }}
-      include-lint: ${{ inputs.include-lint }} 
+      include-lint: ${{ inputs.include-lint }}
+      is_dev: true

.github/workflows/nightly.yml

@@ -49,6 +49,10 @@ on:
         description: "Include CairoLint in build"
         type: boolean
         default: true
+      is_dev:
+        description: "Is this a dev build"
+        type: boolean
+        default: false
   schedule:
     - cron: '0 0 * * 3,6'
 
@@ -99,6 +103,8 @@ jobs:
       - name: Determine nightly version
         id: version
         shell: bash
+        env:
+          IS_SCARB_DEV: ${{ inputs.is_dev }}
         run: |
           NIGHTLY_TAG=$(cargo xtask get-nightly-version --tag)
           NIGHTLY_VERSION=$(cargo xtask get-nightly-version)
@@ -119,6 +125,8 @@ jobs:
         run: cargo build -p xtask
 
       - name: Compose release notes
+        env:
+          IS_SCARB_DEV: ${{ inputs.is_dev }}
         run: cargo xtask nightly-release-notes > NIGHTLY_RELEASE_NOTES.md
 
       - name: Commit patches

xtask/src/get_nightly_version.rs

@@ -8,30 +8,33 @@ use time::OffsetDateTime;
 pub struct Args {
     #[arg(short, long)]
     tag: bool,
+    #[arg(long, env = "IS_SCARB_DEV")]
+    dev: bool,
 }
 
 pub fn main(args: Args) -> Result<()> {
-    let tag = nightly_tag();
+    let tag = nightly_tag(args.dev);
     if args.tag {
         println!("{tag}");
     } else {
-        let version = nightly_version()?;
+        let version = nightly_version(args.dev)?;
         println!("{version}");
     }
     Ok(())
 }
 
-pub fn nightly_version() -> Result<Version> {
+pub fn nightly_version(is_dev: bool) -> Result<Version> {
     let mut version = expected_version()?;
     version.pre = Prerelease::EMPTY;
-    version.build = BuildMetadata::new(&nightly_tag()).unwrap();
+    version.build = BuildMetadata::new(&nightly_tag(is_dev)).unwrap();
     Ok(version)
 }
 
-pub fn nightly_tag() -> String {
+pub fn nightly_tag(is_dev: bool) -> String {
+    let prefix = if is_dev { "dev" } else { "nightly" };
     let dt = OffsetDateTime::now_utc();
     format!(
-        "nightly-{}-{:0>2}-{:0>2}",
+        "{prefix}-{}-{:0>2}-{:0>2}",
         dt.year(),
         u8::from(dt.month()),
         dt.day()

xtask/src/nightly_release_notes.rs

@@ -1,18 +1,21 @@
 use anyhow::Result;
 use clap::Parser;
-use xshell::{cmd, Shell};
+use xshell::{Shell, cmd};
 
 use crate::get_nightly_version::nightly_version;
 
 #[derive(Parser)]
-pub struct Args;
+pub struct Args {
+    #[arg(long, env = "IS_SCARB_DEV")]
+    dev: bool,
+}
 
-pub fn main(_: Args) -> Result<()> {
+pub fn main(args: Args) -> Result<()> {
     // Note: We do not use scarb-build-metadata here because it requires rebuilding xtasks.
 
     let sh = Shell::new()?;
 
-    let version = nightly_version()?;
+    let version = nightly_version(args.dev)?;
 
     let scarb_commit = cmd!(sh, "git log -1 --date=short --format=%H").read()?;
 
@@ -28,10 +31,7 @@ pub fn main(_: Args) -> Result<()> {
         .unwrap()
         .iter()
         .find(|node| {
-            let repr = node.get("id")
-                .unwrap()
-                .as_str()
-                .unwrap();
+            let repr = node.get("id").unwrap().as_str().unwrap();
             // The first condition for Rust >= 1.77
             // (After the PackageId spec stabilization)
             // The second condition for Rust < 1.77