Skip to content

Commit efef076

Browse files
committed
Revert "stop building and releasing windows powershell installer"
This reverts commit 254b339.
1 parent 4375a7a commit efef076

7 files changed

Lines changed: 627 additions & 3 deletions

File tree

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
java-version: 8
3030
distribution: 'temurin'
3131
- name: Set up Clojure
32-
uses: DeLaGuardo/setup-clojure@13.4
32+
uses: DeLaGuardo/setup-clojure@13.2
3333
with:
3434
cli: ${{ github.event.inputs.version }}
3535
- name: Check downloaded version

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
java-version: 8
2929
distribution: 'temurin'
3030
- name: Set up Clojure
31-
uses: DeLaGuardo/setup-clojure@13.4
31+
uses: DeLaGuardo/setup-clojure@13.2
3232
with:
3333
cli: latest
3434
- name: Cache clojure dependencies
@@ -55,7 +55,7 @@ jobs:
5555
git push --tags
5656
git push
5757
- name: Upload to github release
58-
run: gh release create "$VERSION" -p -t "$VERSION" "target/clojure@$VERSION.rb" "target/clojure-tools-$VERSION.tar.gz" "target/clojure-tools-$VERSION.tar.gz.sha256" "target/linux-install.sh" "target/posix-install.sh"
58+
run: gh release create "$VERSION" -p -t "$VERSION" "target/clojure@$VERSION.rb" "target/clojure-tools-$VERSION.tar.gz" "target/clojure-tools-$VERSION.tar.gz.sha256" "target/linux-install.sh" "target/posix-install.sh" "target/clojure-tools.zip" "target/win-install.ps1" "target/clojure-tools.zip.sha256"
5959
env:
6060
GH_TOKEN: ${{secrets.GH_TOKEN}}
6161
- name: Publish versioned brew recipe to tap

script/build.clj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717
(def class-dir "target/classes")
1818
(def exec-dir "target/exec")
1919
(def tar-dir "target/clojure-tools")
20+
(def zip-dir "target/win")
2021
(def uber-file (format "target/clojure-tools-%s.jar" version))
2122
(def tar-file (format "target/clojure-tools-%s.tar.gz" version))
23+
(def zip-file "target/clojure-tools.zip")
2224
(def exec-file "target/exec.jar")
2325

2426
(defn clean
@@ -61,6 +63,13 @@
6163
(b/copy-dir {:src-dirs [target-dir] :target-dir tar-dir :include "*.jar"})
6264
(b/process {:command-args ["tar" "-cvzf" tar-file "-Ctarget" "clojure-tools"]})
6365

66+
;; Collect the windows files and make the windows zip file and installer
67+
(doseq [f ["ClojureTools.psd1" "ClojureTools.psm1" "deps.edn" "example-deps.edn" "tools.edn"]]
68+
(b/copy-file {:src (str filtered-dir "/clojure/install/" f) :target (str zip-dir "/ClojureTools/" f)}))
69+
(b/copy-dir {:src-dirs [target-dir] :target-dir (str zip-dir "/ClojureTools") :include "*.jar"})
70+
(b/zip {:src-dirs [zip-dir] :zip-file zip-file})
71+
(b/copy-file {:src (str filtered-dir "/clojure/install/win-install.ps1") :target (str target-dir "/win-install.ps1")})
72+
6473
;; Embed artifact checksums within installers
6574
(let [sha (-> (:out (b/process {:command-args ["shasum" "-a" "256" tar-file] :out :capture})) (subs 0 64))]
6675
(doseq [[src target] [["clojure/install/clojure.rb"]

script/publish.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,11 @@ if [[ ! -z "$S3_BUCKET" ]]; then
2424
echo "Deploying https://download.clojure.org/install/posix-install-$version.sh"
2525
aws s3 cp --only-show-errors "target/posix-install.sh" "$S3_BUCKET/install/posix-install.sh"
2626
aws s3 cp --only-show-errors "target/posix-install.sh" "$S3_BUCKET/install/posix-install-$version.sh"
27+
echo "Deploying https://download.clojure.org/install/clojure-tools-$version.zip"
28+
echo "$(shasum -a 256 target/clojure-tools.zip | cut -c 1-64)" > target/clojure-tools.zip.sha256
29+
aws s3 cp --only-show-errors "target/clojure-tools.zip" "$S3_BUCKET/install/clojure-tools.zip"
30+
aws s3 cp --only-show-errors "target/clojure-tools.zip" "$S3_BUCKET/install/clojure-tools-$version.zip"
31+
echo "Deploying https://download.clojure.org/install/win-install-$version.ps1"
32+
aws s3 cp --only-show-errors "target/win-install.ps1" "$S3_BUCKET/install/win-install.ps1"
33+
aws s3 cp --only-show-errors "target/win-install.ps1" "$S3_BUCKET/install/win-install-$version.ps1"
2734
fi
Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
@{
2+
3+
# Script module or binary module file associated with this manifest.
4+
RootModule = 'ClojureTools.psm1'
5+
6+
# Version number of this module.
7+
ModuleVersion = '${project.version}'
8+
9+
# Supported PSEditions
10+
# CompatiblePSEditions = @()
11+
12+
# ID used to uniquely identify this module
13+
GUID = 'd5a9d8ac-5951-4a8d-9dec-2d5f47518e5b'
14+
15+
# Author of this module
16+
Author = 'Rich Hickey'
17+
18+
# Company or vendor of this module
19+
CompanyName = 'Rich Hickey'
20+
21+
# Copyright statement for this module
22+
Copyright = '(c) Rich Hickey. All rights reserved.'
23+
24+
# Description of the functionality provided by this module
25+
Description = 'Provides an unofficial Clojure tools install'
26+
27+
# Minimum version of the PowerShell engine required by this module
28+
# PowerShellVersion = ''
29+
30+
# Name of the PowerShell host required by this module
31+
# PowerShellHostName = ''
32+
33+
# Minimum version of the PowerShell host required by this module
34+
# PowerShellHostVersion = ''
35+
36+
# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
37+
# DotNetFrameworkVersion = ''
38+
39+
# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
40+
# CLRVersion = ''
41+
42+
# Processor architecture (None, X86, Amd64) required by this module
43+
# ProcessorArchitecture = ''
44+
45+
# Modules that must be imported into the global environment prior to importing this module
46+
# RequiredModules = @()
47+
48+
# Assemblies that must be loaded prior to importing this module
49+
# RequiredAssemblies = @()
50+
51+
# Script files (.ps1) that are run in the caller's environment prior to importing this module.
52+
# ScriptsToProcess = @()
53+
54+
# Type files (.ps1xml) to be loaded when importing this module
55+
# TypesToProcess = @()
56+
57+
# Format files (.ps1xml) to be loaded when importing this module
58+
# FormatsToProcess = @()
59+
60+
# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
61+
# NestedModules = @()
62+
63+
# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
64+
FunctionsToExport = 'Invoke-Clojure'
65+
66+
# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
67+
CmdletsToExport = @()
68+
69+
# Variables to export from this module
70+
VariablesToExport = '*'
71+
72+
# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
73+
AliasesToExport = 'clj', 'clojure'
74+
75+
# DSC resources to export from this module
76+
# DscResourcesToExport = @()
77+
78+
# List of all modules packaged with this module
79+
# ModuleList = @()
80+
81+
# List of all files packaged with this module
82+
FileList = 'deps.edn', 'example-deps.edn', 'exec.jar', 'clojure-tools-${project.version}.jar'
83+
84+
# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
85+
PrivateData = @{
86+
87+
PSData = @{
88+
89+
# Tags applied to this module. These help with module discovery in online galleries.
90+
Tags = 'clojure'
91+
92+
# A URL to the license for this module.
93+
LicenseUri = 'https://www.eclipse.org/legal/epl-v10.html'
94+
95+
# A URL to the main website for this project.
96+
ProjectUri = 'https://github.com/clojure/brew-install'
97+
98+
# A URL to an icon representing this module.
99+
# IconUri = ''
100+
101+
# ReleaseNotes of this module
102+
# ReleaseNotes = ''
103+
104+
} # End of PSData hashtable
105+
106+
} # End of PrivateData hashtable
107+
108+
# HelpInfo URI of this module
109+
# HelpInfoURI = ''
110+
111+
# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
112+
# DefaultCommandPrefix = ''
113+
114+
}

0 commit comments

Comments
 (0)