chore: change win -> windows

jdx · Sep 17, 2024 · e45623c · e45623c
1 parent b9f5ac2
commit e45623c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: release
 on:
   push:
     tags: ["v*"]
-    branches: ["release", "win", "docs"]
+    branches: ["release", "windows", "docs"]
   workflow_dispatch:
 
 concurrency:
@@ -64,7 +64,7 @@ jobs:
             target: aarch64-apple-darwin
             runs-on: macos-14
     #          - os: windows
-    #            name: win-x64
+    #            name: windows-x64
     #            target: x86_64-pc-windows-gnu
     #            runs-on: ubuntu-latest
     steps:
@@ -110,8 +110,8 @@ jobs:
       - if: steps.cache-crates.outputs.cache-hit != 'true'
         run: cargo cache --autoclean
       - run: ${SCCACHE_PATH} --show-stats
-  build-tarball-win:
-    name: build-tarball-win-${{matrix.arch}}
+  build-tarball-windows:
+    name: build-tarball-windows-${{matrix.arch}}
     runs-on: windows-latest
     timeout-minutes: 45
     env:
@@ -143,7 +143,7 @@ jobs:
           restore-keys: cargo-registry
       - run: scripts/build-tarball.ps1 ${{matrix.target}}
         env:
-          OS: win
+          OS: windows
           ARCH: ${{matrix.arch}}
       - uses: actions/upload-artifact@v4
         with:
@@ -249,7 +249,7 @@ jobs:
       - rpm
       - deb
       - e2e-linux
-      - build-tarball-win
+      - build-tarball-windows
     steps:
       - uses: actions/checkout@v4
       - uses: crazy-max/ghaction-import-gpg@v6

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -215,7 +215,7 @@ jobs:
         with:
           recreate: true
           path: code-coverage-results.md
-  win:
+  windows:
     runs-on: windows-latest
     timeout-minutes: 20
     steps:

diff --git a/scripts/build-tarball.sh b/scripts/build-tarball.sh
@@ -84,7 +84,7 @@ cp "target/$RUST_TRIPLE/serious/mise"* dist/mise/bin
 cp README.md dist/mise/README.md
 cp LICENSE dist/mise/LICENSE
 
-if [[ "$os" != "win" ]]; then
+if [[ "$os" != "windows" ]]; then
   cp {,dist/mise/}man/man1/mise.1
   cp {,dist/mise/}share/fish/vendor_conf.d/mise-activate.fish
 fi
@@ -95,7 +95,7 @@ if [[ "$os" == "macos" ]]; then
   codesign -f -s "Developer ID Application: Jeffrey Dickey (4993Y37DX6)" mise/bin/mise
 fi
 
-if [[ "$os" == "win" ]]; then
+if [[ "$os" == "windows" ]]; then
   zip -r "$basename.zip" mise
   ls -oh "$basename.zip"
 else

diff --git a/scripts/release-npm.sh b/scripts/release-npm.sh
@@ -87,10 +87,10 @@ function installArchSpecificPackage(version) {
 
     process.env.npm_config_global = 'false';
 
-    var platform = process.platform == 'win32' ? 'win' : process.platform;
-    var arch = platform == 'win' && process.arch == 'ia32' ? 'x86' : process.arch;
+    var platform = process.platform == 'win32' ? 'windows' : process.platform;
+    var arch = platform == 'windows' && process.arch == 'ia32' ? 'x86' : process.arch;
 
-    var cp = spawn(platform == 'win' ? 'npm.cmd' : 'npm', ['install', '--no-save', ['$NPM_PREFIX', platform, arch].join('-') + '@' + version], {
+    var cp = spawn(platform == 'windows' ? 'npm.cmd' : 'npm', ['install', '--no-save', ['$NPM_PREFIX', platform, arch].join('-') + '@' + version], {
         stdio: 'inherit',
         shell: true
     });
@@ -111,7 +111,7 @@ function installArchSpecificPackage(version) {
 
         linkSync(bin, path.resolve(process.cwd(), executable));
 
-        if (platform == 'win') {
+        if (platform == 'windows') {
             var pkg = JSON.parse(fs.readFileSync(path.resolve(process.cwd(), 'package.json')));
             fs.writeFileSync(path.resolve(process.cwd(), 'bin/mise'), 'This file intentionally left blank');
             pkg.bin.mise = 'bin/mise.exe';

diff --git a/scripts/release.sh b/scripts/release.sh
@@ -35,11 +35,11 @@ for platform in "${platforms[@]}"; do
   cp -v mise/bin/mise "$RELEASE_DIR/$MISE_VERSION/mise-$MISE_VERSION-$platform"
 done
 
-win_platforms=(
-  win-arm64
-  win-x64
+windows_platforms=(
+  windows-arm64
+  windows-x64
 )
-for platform in "${win_platforms[@]}"; do
+for platform in "${windows_platforms[@]}"; do
   cp artifacts/*/"mise-$MISE_VERSION-$platform.zip" "$RELEASE_DIR/$MISE_VERSION/mise-$MISE_VERSION-$platform.zip"
   zipsign sign zip "$RELEASE_DIR/$MISE_VERSION/mise-$MISE_VERSION-$platform.zip" ~/.zipsign/mise.priv
   zipsign verify zip "$RELEASE_DIR/$MISE_VERSION/mise-$MISE_VERSION-$platform.zip" "$BASE_DIR/zipsign.pub"