mirror of
https://github.com/jimeh/build-emacs-for-macos.git
synced 2026-02-19 13:06:38 +00:00
Compare commits
61 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
3d6c7fff64
|
|||
|
d08d1b9b5c
|
|||
|
6e32219c24
|
|||
|
d2548191f1
|
|||
|
8ed16b27c0
|
|||
|
14f7aa13d9
|
|||
| 59ebbdaa2b | |||
|
d98c14dde5
|
|||
|
590b0ac21a
|
|||
|
8c84ef128f
|
|||
|
8b447b6237
|
|||
|
c3d19694e7
|
|||
|
cff89684c6
|
|||
|
48a512fbce
|
|||
|
a3530c02e8
|
|||
|
138ac74ba5
|
|||
|
0ba971ef61
|
|||
|
1ae8771b2c
|
|||
|
1f2868d4b3
|
|||
|
bfa5bcf79b
|
|||
| 02d85f899f | |||
|
aeb3a75e5c
|
|||
|
|
e0fd2b16eb
|
||
|
d24ac084b7
|
|||
| 159a7333de | |||
|
b582523642
|
|||
|
4f1e748df2
|
|||
|
d984633991
|
|||
|
616f74d624
|
|||
|
d7963b7664
|
|||
|
a20a8456ab
|
|||
|
8ad3ff4f53
|
|||
|
e31f5aaf93
|
|||
|
c2fb07fdb8
|
|||
|
07e0e3dacd
|
|||
|
efddb9ef92
|
|||
| f7f4c0433a | |||
|
cbd8cb27b6
|
|||
|
656b96510a
|
|||
|
084776db6b
|
|||
|
1e6d6cc6cf
|
|||
|
68ef4c066c
|
|||
|
d476fd33ec
|
|||
| baa5930467 | |||
|
743b10c751
|
|||
|
59f1bcd3e8
|
|||
| e767e284b7 | |||
|
8129a2e93b
|
|||
|
4ae288cae3
|
|||
|
3bd78d130a
|
|||
|
fb5362ce18
|
|||
|
1a34a9504a
|
|||
| 8513521d29 | |||
|
88bbefadc6
|
|||
|
f1bf1d93b8
|
|||
|
8a467b0d43
|
|||
|
9c29f721b4
|
|||
|
4ac71ddf39
|
|||
|
d338c136db
|
|||
|
d054a17fc7
|
|||
|
4030ceb9ca
|
23
.rubocop.yml
23
.rubocop.yml
@@ -1,9 +1,30 @@
|
||||
AllCops:
|
||||
TargetRubyVersion: 2.3
|
||||
TargetRubyVersion: 2.4
|
||||
NewCops: enable
|
||||
|
||||
Layout/LineLength:
|
||||
Max: 80
|
||||
|
||||
Style/AccessorGrouping:
|
||||
Enabled: false
|
||||
|
||||
Style/Documentation:
|
||||
Enabled: false
|
||||
|
||||
Metrics/AbcSize:
|
||||
Enabled: false
|
||||
|
||||
Metrics/BlockLength:
|
||||
Enabled: false
|
||||
|
||||
Metrics/ClassLength:
|
||||
Enabled: false
|
||||
|
||||
Metrics/CyclomaticComplexity:
|
||||
Enabled: false
|
||||
|
||||
Metrics/MethodLength:
|
||||
Enabled: false
|
||||
|
||||
Metrics/PerceivedComplexity:
|
||||
Enabled: false
|
||||
|
||||
5
Brewfile
5
Brewfile
@@ -2,7 +2,7 @@
|
||||
|
||||
brew 'autoconf'
|
||||
brew 'coreutils'
|
||||
brew 'curl'
|
||||
brew 'dbus'
|
||||
brew 'expat'
|
||||
brew 'gcc'
|
||||
brew 'gmp'
|
||||
@@ -22,5 +22,8 @@ brew 'make'
|
||||
brew 'ncurses'
|
||||
brew 'nettle'
|
||||
brew 'pkg-config'
|
||||
brew 'sqlite'
|
||||
brew 'texinfo'
|
||||
brew 'tree-sitter'
|
||||
brew 'webp'
|
||||
brew 'zlib'
|
||||
|
||||
141
CHANGELOG.md
141
CHANGELOG.md
@@ -2,6 +2,147 @@
|
||||
|
||||
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
|
||||
|
||||
### [0.6.42](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.41...v0.6.42) (2023-07-31)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* options for log-level and github source repository ([d08d1b9](https://github.com/jimeh/build-emacs-for-macos/commit/d08d1b9b5c4001302564dc8915884c465802f3b5))
|
||||
|
||||
### [0.6.41](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.40...v0.6.41) (2023-01-16)
|
||||
|
||||
### [0.6.40](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.39...v0.6.40) (2023-01-08)
|
||||
|
||||
### [0.6.39](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.38...v0.6.39) (2022-12-04)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **deprecate:** posix-spawn patch is no longer supported ([c3d1969](https://github.com/jimeh/build-emacs-for-macos/commit/c3d19694e7e4d33d462c9917683c2d63f69002f5))
|
||||
* **version:** correctly handle Emacs 30.x builds ([8b447b6](https://github.com/jimeh/build-emacs-for-macos/commit/8b447b6237fbbd94c4e72af8ee79969c7cfc9363))
|
||||
|
||||
### [0.6.38](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.37...v0.6.38) (2022-12-01)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **patch:** add round-undecorated-frame from emacs-plus for 29.x ([48a512f](https://github.com/jimeh/build-emacs-for-macos/commit/48a512fbce79759caa987e2880585bd0bc937977))
|
||||
* **patch:** add support for experimental poll patch from emacs-plus for 29.x ([a3530c0](https://github.com/jimeh/build-emacs-for-macos/commit/a3530c02e8260106f87d464e5cb398dcb2819460))
|
||||
|
||||
### [0.6.37](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.36...v0.6.37) (2022-12-01)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **tree-sitter:** support new --with-tree-sitter configure flag ([0ba971e](https://github.com/jimeh/build-emacs-for-macos/commit/0ba971ef61a195c91e87aa381d5d3b044461b4f6))
|
||||
|
||||
### [0.6.36](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.35...v0.6.36) (2022-10-08)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **native-comp:** support new configure flag format ([1f2868d](https://github.com/jimeh/build-emacs-for-macos/commit/1f2868d4b3784e906665e9f3b6b9bba8fd72292f)), closes [#76](https://github.com/jimeh/build-emacs-for-macos/issues/76)
|
||||
|
||||
### [0.6.35](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.34...v0.6.35) (2022-08-10)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **native-comp:** compatibility with libgccjit 12 homebrew formula ([e0fd2b1](https://github.com/jimeh/build-emacs-for-macos/commit/e0fd2b16eb91ac5a98ed4ec31f4773ab22cbd470))
|
||||
|
||||
### [0.6.34](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.33...v0.6.34) (2022-07-27)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **emacs-28:** patch configure.ac to support latest libgccjit ([b582523](https://github.com/jimeh/build-emacs-for-macos/commit/b582523642ad4c5298f5a7890edd9b48c0433684)), closes [#72](https://github.com/jimeh/build-emacs-for-macos/issues/72)
|
||||
|
||||
### [0.6.33](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.32...v0.6.33) (2022-04-30)
|
||||
|
||||
### [0.6.32](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.31...v0.6.32) (2022-04-30)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **dbus:** add flag to explicitly disable dbus support ([8ad3ff4](https://github.com/jimeh/build-emacs-for-macos/commit/8ad3ff4f53505408aa097527177032a1fd6008e0)), closes [#69](https://github.com/jimeh/build-emacs-for-macos/issues/69)
|
||||
* **deps:** add sqlite brew dependency for Emacs 29.x ([a20a845](https://github.com/jimeh/build-emacs-for-macos/commit/a20a8456ab1e8de6357d5d121b9565ba65a6dd71))
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **native-comp:** support libgccjit 11.3.0 ([e31f5aa](https://github.com/jimeh/build-emacs-for-macos/commit/e31f5aaf9355b674c2a86b8eda35f6513f344b72)), closes [#71](https://github.com/jimeh/build-emacs-for-macos/issues/71)
|
||||
|
||||
### [0.6.31](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.30...v0.6.31) (2022-02-25)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* set source-directory correctly ([07e0e3d](https://github.com/jimeh/build-emacs-for-macos/commit/07e0e3dacddfbdb7a59aceaa2dc9cdf503ac2bcc)), closes [#68](https://github.com/jimeh/build-emacs-for-macos/issues/68)
|
||||
|
||||
### [0.6.30](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.29...v0.6.30) (2022-02-08)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **site-lisp:** add Homebrew's site-lisp directory to locallisppath ([cbd8cb2](https://github.com/jimeh/build-emacs-for-macos/commit/cbd8cb27b6ceff2e128c38cd1cc8f8380b9b4bfb))
|
||||
|
||||
### [0.6.29](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.28...v0.6.29) (2022-02-07)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **cask:** add support for pretest builds ([084776d](https://github.com/jimeh/build-emacs-for-macos/commit/084776db6b7e61958088d7b2a2588e9889e60c21))
|
||||
|
||||
### [0.6.28](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.27...v0.6.28) (2022-01-15)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **build:** add dbus dependency to enable support in Emacs builds ([68ef4c0](https://github.com/jimeh/build-emacs-for-macos/commit/68ef4c066c3fd1a7337198e8f773866088b4f481))
|
||||
|
||||
### [0.6.27](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.26...v0.6.27) (2021-12-05)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **plan:** add support for pretest and release candidate builds ([743b10c](https://github.com/jimeh/build-emacs-for-macos/commit/743b10c751e146ec7569f39a475c20a0489955f4))
|
||||
|
||||
### [0.6.26](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.25...v0.6.26) (2021-11-27)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **build:** re-link eln files by default again ([4ae288c](https://github.com/jimeh/build-emacs-for-macos/commit/4ae288cae34c5e1d291dad7b6b654fe37c4a221f))
|
||||
* **native-comp:** no longer require gcc homebrew formula ([3bd78d1](https://github.com/jimeh/build-emacs-for-macos/commit/3bd78d130a5419a6530a7d30e271569e501870fb)), closes [#53](https://github.com/jimeh/build-emacs-for-macos/issues/53)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **embed:** relink shared libraries with [@rpath](https://github.com/rpath) instead of [@executable](https://github.com/executable)_path ([fb5362c](https://github.com/jimeh/build-emacs-for-macos/commit/fb5362ce183ce43e52afcc0fc721cf2145f9c85b))
|
||||
|
||||
### [0.6.25](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.24...v0.6.25) (2021-11-25)
|
||||
|
||||
### [0.6.24](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.23...v0.6.24) (2021-11-24)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **embedding:** embedding GCC fails when paths do not require sanitizing ([8a467b0](https://github.com/jimeh/build-emacs-for-macos/commit/8a467b0d43140f6956d53c27e2319ae1b572868c))
|
||||
|
||||
### [0.6.23](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.22...v0.6.23) (2021-11-10)
|
||||
|
||||
|
||||
### Bug Fixes
|
||||
|
||||
* **build:** do not re-link eln files by default ([d338c13](https://github.com/jimeh/build-emacs-for-macos/commit/d338c136db8acc4378154cf66ed7db5462787602)), closes [#60](https://github.com/jimeh/build-emacs-for-macos/issues/60)
|
||||
|
||||
### [0.6.22](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.21...v0.6.22) (2021-11-10)
|
||||
|
||||
|
||||
### Features
|
||||
|
||||
* **patch:** add support for posix-spawn patch from emacs-plus ([4030ceb](https://github.com/jimeh/build-emacs-for-macos/commit/4030ceb9cab6749af3c28161ac97caec90a8aed0))
|
||||
|
||||
### [0.6.21](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.20...v0.6.21) (2021-10-27)
|
||||
|
||||
### [0.6.20](https://github.com/jimeh/build-emacs-for-macos/compare/v0.6.19...v0.6.20) (2021-10-23)
|
||||
|
||||
53
README.md
53
README.md
@@ -17,21 +17,10 @@ Use this script at your own risk.
|
||||
built from the `master` branch. This script allows you to choose any branch,
|
||||
tag, or git ref you want.
|
||||
|
||||
## Status
|
||||
## Binary Builds
|
||||
|
||||
As of writing (2021-04-25) it works for me on my machine. Your luck may vary.
|
||||
|
||||
I have successfully built:
|
||||
|
||||
- `emacs-27.1` release git tag
|
||||
- `master` branch (Emacs 28.x)
|
||||
- `feature/native-comp` branch (Emacs 28.x)
|
||||
|
||||
For reference, my machine is:
|
||||
|
||||
- 13-inch MacBook Pro (2020), 10th-gen 2.3 GHz Quad-Core Intel Core i7 (4c/8t)
|
||||
- macOS Big Sur 11.2.3 (20D91)
|
||||
- Xcode 12.4 (12D4e)
|
||||
Nightly and stable binary builds produced with this build script are available
|
||||
from [jimeh/emacs-builds](https://github.com/jimeh/emacs-builds).
|
||||
|
||||
## Limitations
|
||||
|
||||
@@ -41,14 +30,9 @@ The build produced does have some limitations:
|
||||
application will be that of the machine it was built on.
|
||||
- The minimum required macOS version of the built application will be the same
|
||||
as that of the machine it was built on.
|
||||
- The application is not signed, so running it on machines other than the one
|
||||
that built the application will yield warnings. If you want to make a signed
|
||||
Emacs.app, google is you friend for finding signing instructions.
|
||||
|
||||
## Binary Builds
|
||||
|
||||
Nightly and stable binary builds produced with this build script are available
|
||||
from [jimeh/emacs-builds](https://github.com/jimeh/emacs-builds).
|
||||
- The application is not signed automatically, but the CLI tool used to sign the
|
||||
nightly builds is available. Run `go run ./cmd/emacs-builder package --help`
|
||||
for details. More detailed instructions will come soon.
|
||||
|
||||
## Requirements
|
||||
|
||||
@@ -66,6 +50,26 @@ from [jimeh/emacs-builds](https://github.com/jimeh/emacs-builds).
|
||||
brew install ruby
|
||||
```
|
||||
|
||||
## Status
|
||||
|
||||
As of writing (2021-11-27) it works for me on my machine and for the nightly
|
||||
builds in [jimeh/emacs-builds](https://github.com/jimeh/emacs-builds). Your luck
|
||||
may vary.
|
||||
|
||||
I have successfully built:
|
||||
|
||||
- `emacs-28` release branch
|
||||
- `master` branch (Emacs 29.x)
|
||||
|
||||
For reference, my machine is:
|
||||
|
||||
- 13-inch MacBook Pro (2020), 10th-gen 2.3 GHz Quad-Core Intel Core i7 (4c/8t)
|
||||
- macOS Monterey 12.0.1 (21A559)
|
||||
- Xcode 13.1 (13A1030d)
|
||||
|
||||
Nightly builds are built with GitHub Actions on GitHub-hosted runners, using
|
||||
`macos-10.15`.
|
||||
|
||||
## Usage
|
||||
|
||||
```
|
||||
@@ -81,8 +85,10 @@ Options:
|
||||
--[no-]native-comp Enable/disable native-comp (default: enabled if supported)
|
||||
--[no-]native-march Enable/disable -march=native CFLAG(default: disabled)
|
||||
--[no-]native-full-aot Enable/disable NATIVE_FULL_AOT / Ahead of Time compilation (default: disabled)
|
||||
--[no-]relink-eln-files Enable/disable re-linking shared libraries in bundled *.eln files (default: enabled)
|
||||
--[no-]rsvg Enable/disable SVG image support via librsvg (default: enabled)
|
||||
--no-titlebar Apply no-titlebar patch (default: disabled)
|
||||
--posix-spawn Apply posix-spawn patch (default: disabled)
|
||||
--no-frame-refocus Apply no-frame-refocus patch (default: disabled)
|
||||
--[no-]github-auth Make authenticated GitHub API requests if GITHUB_TOKEN environment variable is set.(default: enabled)
|
||||
--work-dir DIR Specify a working directory where tarballs, sources, and builds will be stored and worked with
|
||||
@@ -90,7 +96,8 @@ Options:
|
||||
--build-name NAME Override generated build name
|
||||
--dist-include x,y,z List of extra files to copy from Emacs source into build folder/archive (default: COPYING)
|
||||
--[no-]archive Enable/disable creating *.tbz archive (default: enabled)
|
||||
--[no-]archive-keep Enable/disable keeping source folder for archive (default: disabled)
|
||||
--[no-]archive-keep-build-dir
|
||||
Enable/disable keeping source folder for archive (default: disabled)
|
||||
--plan FILE Follow given plan file, instead of using given git ref/sha
|
||||
```
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
2
go.mod
2
go.mod
@@ -16,7 +16,7 @@ require (
|
||||
github.com/hexops/gotextdiff v1.0.3
|
||||
github.com/jimeh/undent v1.1.0
|
||||
github.com/mattn/go-isatty v0.0.13 // indirect
|
||||
github.com/mitchellh/gon v0.2.3
|
||||
github.com/mitchellh/gon v0.2.5
|
||||
github.com/russross/blackfriday/v2 v2.1.0 // indirect
|
||||
github.com/stretchr/testify v1.7.0
|
||||
github.com/urfave/cli/v2 v2.3.0
|
||||
|
||||
4
go.sum
4
go.sum
@@ -160,8 +160,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky
|
||||
github.com/mattn/go-isatty v0.0.13 h1:qdl+GuBjcsKKDco5BsxPJlId98mSWNKqYA+Co0SC1yA=
|
||||
github.com/mattn/go-isatty v0.0.13/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
|
||||
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
|
||||
github.com/mitchellh/gon v0.2.3 h1:fObN7hD14VacGG++t27GzTW6opP0lwI7TsgTPL55wBo=
|
||||
github.com/mitchellh/gon v0.2.3/go.mod h1:Ua18ZhqjZHg8VyqZo8kNHAY331ntV6nNJ9mT3s2mIo8=
|
||||
github.com/mitchellh/gon v0.2.5 h1:mVWtqTzV03W0avJqmqjk9M0qls3TDUXfc9ETJaPIOWY=
|
||||
github.com/mitchellh/gon v0.2.5/go.mod h1:Ua18ZhqjZHg8VyqZo8kNHAY331ntV6nNJ9mT3s2mIo8=
|
||||
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
|
||||
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
resolve_link() {
|
||||
"$(type -p greadlink readlink | head -1)" "$1"
|
||||
"$(command -v greadlink || command -v readlink)" "$1"
|
||||
}
|
||||
|
||||
abs_dirname() {
|
||||
|
||||
@@ -393,9 +393,7 @@ func (s *Updater) renderCask(
|
||||
filename := asset.GetName()
|
||||
s.logger.Debug("processing asset", "filename", filename)
|
||||
|
||||
if strings.HasSuffix(filename, ".sha256") {
|
||||
filename = strings.TrimSuffix(filename, ".sha256")
|
||||
}
|
||||
filename = strings.TrimSuffix(filename, ".sha256")
|
||||
|
||||
if _, ok := info.Assets[filename]; !ok {
|
||||
info.Assets[filename] = &ReleaseAsset{
|
||||
|
||||
@@ -5,6 +5,7 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"regexp"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/hashicorp/go-hclog"
|
||||
@@ -13,10 +14,13 @@ import (
|
||||
"github.com/jimeh/build-emacs-for-macos/pkg/osinfo"
|
||||
"github.com/jimeh/build-emacs-for-macos/pkg/release"
|
||||
"github.com/jimeh/build-emacs-for-macos/pkg/repository"
|
||||
"github.com/jimeh/build-emacs-for-macos/pkg/sanitize"
|
||||
"github.com/jimeh/build-emacs-for-macos/pkg/source"
|
||||
)
|
||||
|
||||
var nonAlphaNum = regexp.MustCompile(`[^\w_-]+`)
|
||||
var gitTagMatcher = regexp.MustCompile(
|
||||
`^emacs(-.*)?-((\d+\.\d+)(?:\.(\d+))?(-rc\d+)?(.+)?)$`,
|
||||
)
|
||||
|
||||
type TestBuildType string
|
||||
|
||||
@@ -37,7 +41,7 @@ type Options struct {
|
||||
Output io.Writer
|
||||
}
|
||||
|
||||
func Create(ctx context.Context, opts *Options) (*Plan, error) {
|
||||
func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
|
||||
logger := hclog.FromContext(ctx).Named("plan")
|
||||
|
||||
repo, err := repository.NewGitHub(opts.EmacsRepo)
|
||||
@@ -66,19 +70,36 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
version := fmt.Sprintf(
|
||||
absoluteVersion := fmt.Sprintf(
|
||||
"%s.%s.%s",
|
||||
commitInfo.DateString(),
|
||||
commitInfo.ShortSHA(),
|
||||
sanitizeString(opts.Ref),
|
||||
sanitize.String(opts.Ref),
|
||||
)
|
||||
|
||||
releaseName := fmt.Sprintf("Emacs.%s", version)
|
||||
version, channel, err := parseGitRef(opts.Ref)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var releaseName string
|
||||
switch channel {
|
||||
case release.Stable, release.RC:
|
||||
releaseName = "Emacs-" + version
|
||||
case release.Pretest:
|
||||
version += "-pretest"
|
||||
absoluteVersion += "-pretest"
|
||||
releaseName = "Emacs-" + version
|
||||
default:
|
||||
version = absoluteVersion
|
||||
releaseName = "Emacs." + version
|
||||
}
|
||||
|
||||
buildName := fmt.Sprintf(
|
||||
"Emacs.%s.%s.%s",
|
||||
version,
|
||||
sanitizeString(osInfo.Name+"-"+osInfo.DistinctVersion()),
|
||||
sanitizeString(osInfo.Arch),
|
||||
absoluteVersion,
|
||||
sanitize.String(osInfo.Name+"-"+osInfo.DistinctVersion()),
|
||||
sanitize.String(osInfo.Arch),
|
||||
)
|
||||
diskImage := buildName + ".dmg"
|
||||
|
||||
@@ -97,7 +118,8 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) {
|
||||
OS: osInfo,
|
||||
Release: &Release{
|
||||
Name: releaseName,
|
||||
Prerelease: true,
|
||||
Prerelease: channel != release.Stable,
|
||||
Channel: channel,
|
||||
},
|
||||
Output: &Output{
|
||||
Directory: opts.OutputDir,
|
||||
@@ -105,28 +127,18 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) {
|
||||
},
|
||||
}
|
||||
|
||||
// If given git ref is a stable release tag (emacs-23.2b, emacs-27.2, etc.)
|
||||
// we modify release properties accordingly.
|
||||
if v, err := release.GitRefToStableVersion(opts.Ref); err == nil {
|
||||
plan.Release.Prerelease = false
|
||||
plan.Release.Name, err = release.VersionToName(v)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
}
|
||||
|
||||
if opts.TestBuild != "" {
|
||||
testName := sanitizeString(opts.TestBuild)
|
||||
testName := sanitize.String(opts.TestBuild)
|
||||
|
||||
plan.Build.Name += ".test." + testName
|
||||
plan.Release.Title = "Test Builds"
|
||||
plan.Release.Title = "Test Builds (" + testName + ")"
|
||||
plan.Release.Name = "test-builds"
|
||||
|
||||
plan.Release.Prerelease = true
|
||||
plan.Release.Draft = false
|
||||
if opts.TestBuildType == Draft {
|
||||
plan.Release.Prerelease = false
|
||||
plan.Release.Draft = true
|
||||
plan.Release.Prerelease = false
|
||||
plan.Release.Draft = true
|
||||
if opts.TestBuildType == Prerelease {
|
||||
plan.Release.Prerelease = true
|
||||
plan.Release.Draft = false
|
||||
}
|
||||
|
||||
index := strings.LastIndex(diskImage, ".")
|
||||
@@ -137,6 +149,35 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) {
|
||||
return plan, nil
|
||||
}
|
||||
|
||||
func sanitizeString(s string) string {
|
||||
return nonAlphaNum.ReplaceAllString(s, "-")
|
||||
func parseGitRef(ref string) (string, release.Channel, error) {
|
||||
m := gitTagMatcher.FindStringSubmatch(ref)
|
||||
|
||||
if len(m) == 0 {
|
||||
return "", release.Nightly, nil
|
||||
}
|
||||
|
||||
if strings.Contains(m[1], "pretest") {
|
||||
return m[2], release.Pretest, nil
|
||||
}
|
||||
|
||||
if m[4] != "" {
|
||||
n, err := strconv.Atoi(m[4])
|
||||
if err != nil {
|
||||
return "", "", err
|
||||
}
|
||||
|
||||
if n >= 90 {
|
||||
return m[2], release.Pretest, nil
|
||||
}
|
||||
}
|
||||
|
||||
if strings.HasPrefix(m[5], "-rc") {
|
||||
return m[2], release.RC, nil
|
||||
}
|
||||
|
||||
if m[2] == m[3] {
|
||||
return m[2], release.Stable, nil
|
||||
}
|
||||
|
||||
return "", "", nil
|
||||
}
|
||||
|
||||
421
pkg/plan/create_test.go
Normal file
421
pkg/plan/create_test.go
Normal file
@@ -0,0 +1,421 @@
|
||||
package plan
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/jimeh/build-emacs-for-macos/pkg/release"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func Test_parseGitRef(t *testing.T) {
|
||||
t.Parallel()
|
||||
|
||||
type args struct {
|
||||
ref string
|
||||
}
|
||||
type want struct {
|
||||
version string
|
||||
channel release.Channel
|
||||
err string
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
args args
|
||||
want want
|
||||
}{
|
||||
{
|
||||
name: "master",
|
||||
args: args{ref: "master"},
|
||||
want: want{version: "", channel: release.Nightly, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-28",
|
||||
args: args{ref: "emacs-28"},
|
||||
want: want{version: "", channel: release.Nightly, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27",
|
||||
args: args{ref: "emacs-27"},
|
||||
want: want{version: "", channel: release.Nightly, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26",
|
||||
args: args{ref: "emacs-26"},
|
||||
want: want{version: "", channel: release.Nightly, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24",
|
||||
args: args{ref: "emacs-24"},
|
||||
want: want{version: "", channel: release.Nightly, err: ""},
|
||||
},
|
||||
{
|
||||
name: "feature/native-comp",
|
||||
args: args{ref: "feature/native-comp"},
|
||||
want: want{version: "", channel: release.Nightly, err: ""},
|
||||
},
|
||||
{
|
||||
name: "feature/pgtk",
|
||||
args: args{ref: "feature/pgtk"},
|
||||
want: want{version: "", channel: release.Nightly, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-19.34",
|
||||
args: args{ref: "emacs-19.34"},
|
||||
want: want{version: "19.34", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-20.4",
|
||||
args: args{ref: "emacs-20.4"},
|
||||
want: want{version: "20.4", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-22.3",
|
||||
args: args{ref: "emacs-22.3"},
|
||||
want: want{version: "22.3", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-23.4",
|
||||
args: args{ref: "emacs-23.4"},
|
||||
want: want{version: "23.4", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.0.97",
|
||||
args: args{ref: "emacs-24.0.97"},
|
||||
want: want{version: "24.0.97", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.2",
|
||||
args: args{ref: "emacs-24.2"},
|
||||
want: want{version: "24.2", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.2.90",
|
||||
args: args{ref: "emacs-24.2.90"},
|
||||
want: want{version: "24.2.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.2.93",
|
||||
args: args{ref: "emacs-24.2.93"},
|
||||
want: want{version: "24.2.93", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.3",
|
||||
args: args{ref: "emacs-24.3"},
|
||||
want: want{version: "24.3", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.3-rc1",
|
||||
args: args{ref: "emacs-24.3-rc1"},
|
||||
want: want{version: "24.3-rc1", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.3.90",
|
||||
args: args{ref: "emacs-24.3.90"},
|
||||
want: want{version: "24.3.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.3.94",
|
||||
args: args{ref: "emacs-24.3.94"},
|
||||
want: want{version: "24.3.94", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.4",
|
||||
args: args{ref: "emacs-24.4"},
|
||||
want: want{version: "24.4", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.4-rc1",
|
||||
args: args{ref: "emacs-24.4-rc1"},
|
||||
want: want{version: "24.4-rc1", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.4.90",
|
||||
args: args{ref: "emacs-24.4.90"},
|
||||
want: want{version: "24.4.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.4.91",
|
||||
args: args{ref: "emacs-24.4.91"},
|
||||
want: want{version: "24.4.91", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.5",
|
||||
args: args{ref: "emacs-24.5"},
|
||||
want: want{version: "24.5", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.5-rc1",
|
||||
args: args{ref: "emacs-24.5-rc1"},
|
||||
want: want{version: "24.5-rc1", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.5-rc3",
|
||||
args: args{ref: "emacs-24.5-rc3"},
|
||||
want: want{version: "24.5-rc3", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-24.5-rc3-fixed",
|
||||
args: args{ref: "emacs-24.5-rc3-fixed"},
|
||||
want: want{version: "24.5-rc3-fixed", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-25.0.90",
|
||||
args: args{ref: "emacs-25.0.90"},
|
||||
want: want{version: "25.0.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-25.0.95",
|
||||
args: args{ref: "emacs-25.0.95"},
|
||||
want: want{version: "25.0.95", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-25.1",
|
||||
args: args{ref: "emacs-25.1"},
|
||||
want: want{version: "25.1", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-25.1-rc1",
|
||||
args: args{ref: "emacs-25.1-rc1"},
|
||||
want: want{version: "25.1-rc1", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-25.1-rc2",
|
||||
args: args{ref: "emacs-25.1-rc2"},
|
||||
want: want{version: "25.1-rc2", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-25.1.90",
|
||||
args: args{ref: "emacs-25.1.90"},
|
||||
want: want{version: "25.1.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-25.1.91",
|
||||
args: args{ref: "emacs-25.1.91"},
|
||||
want: want{version: "25.1.91", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-25.2",
|
||||
args: args{ref: "emacs-25.2"},
|
||||
want: want{version: "25.2", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-25.2-rc1",
|
||||
args: args{ref: "emacs-25.2-rc1"},
|
||||
want: want{version: "25.2-rc1", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-25.2-rc2",
|
||||
args: args{ref: "emacs-25.2-rc2"},
|
||||
want: want{version: "25.2-rc2", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26.0.90",
|
||||
args: args{ref: "emacs-26.0.90"},
|
||||
want: want{version: "26.0.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26.0.91",
|
||||
args: args{ref: "emacs-26.0.91"},
|
||||
want: want{version: "26.0.91", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26.1",
|
||||
args: args{ref: "emacs-26.1"},
|
||||
want: want{version: "26.1", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26.1-rc1",
|
||||
args: args{ref: "emacs-26.1-rc1"},
|
||||
want: want{version: "26.1-rc1", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26.1.90",
|
||||
args: args{ref: "emacs-26.1.90"},
|
||||
want: want{version: "26.1.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26.1.92",
|
||||
args: args{ref: "emacs-26.1.92"},
|
||||
want: want{version: "26.1.92", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26.2",
|
||||
args: args{ref: "emacs-26.2"},
|
||||
want: want{version: "26.2", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26.2.90",
|
||||
args: args{ref: "emacs-26.2.90"},
|
||||
want: want{version: "26.2.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26.3",
|
||||
args: args{ref: "emacs-26.3"},
|
||||
want: want{version: "26.3", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-26.3-rc1",
|
||||
args: args{ref: "emacs-26.3-rc1"},
|
||||
want: want{version: "26.3-rc1", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27.0.90",
|
||||
args: args{ref: "emacs-27.0.90"},
|
||||
want: want{version: "27.0.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27.0.91",
|
||||
args: args{ref: "emacs-27.0.91"},
|
||||
want: want{version: "27.0.91", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27.1",
|
||||
args: args{ref: "emacs-27.1"},
|
||||
want: want{version: "27.1", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27.1-rc1",
|
||||
args: args{ref: "emacs-27.1-rc1"},
|
||||
want: want{version: "27.1-rc1", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27.1-rc2",
|
||||
args: args{ref: "emacs-27.1-rc2"},
|
||||
want: want{version: "27.1-rc2", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27.1.90",
|
||||
args: args{ref: "emacs-27.1.90"},
|
||||
want: want{version: "27.1.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27.1.91",
|
||||
args: args{ref: "emacs-27.1.91"},
|
||||
want: want{version: "27.1.91", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27.2",
|
||||
args: args{ref: "emacs-27.2"},
|
||||
want: want{version: "27.2", channel: release.Stable, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27.2-rc1",
|
||||
args: args{ref: "emacs-27.2-rc1"},
|
||||
want: want{version: "27.2-rc1", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-27.2-rc2",
|
||||
args: args{ref: "emacs-27.2-rc2"},
|
||||
want: want{version: "27.2-rc2", channel: release.RC, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-28.0.90",
|
||||
args: args{ref: "emacs-28.0.90"},
|
||||
want: want{version: "28.0.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-21.0.100",
|
||||
args: args{ref: "emacs-pretest-21.0.100"},
|
||||
want: want{version: "21.0.100", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-21.0.106",
|
||||
args: args{ref: "emacs-pretest-21.0.106"},
|
||||
want: want{version: "21.0.106", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-21.0.90",
|
||||
args: args{ref: "emacs-pretest-21.0.90"},
|
||||
want: want{version: "21.0.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-21.0.99",
|
||||
args: args{ref: "emacs-pretest-21.0.99"},
|
||||
want: want{version: "21.0.99", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-22.0.90",
|
||||
args: args{ref: "emacs-pretest-22.0.90"},
|
||||
want: want{version: "22.0.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-22.0.99",
|
||||
args: args{ref: "emacs-pretest-22.0.99"},
|
||||
want: want{version: "22.0.99", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-22.0.990",
|
||||
args: args{ref: "emacs-pretest-22.0.990"},
|
||||
want: want{version: "22.0.990", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-22.1.90",
|
||||
args: args{ref: "emacs-pretest-22.1.90"},
|
||||
want: want{version: "22.1.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-22.2.90",
|
||||
args: args{ref: "emacs-pretest-22.2.90"},
|
||||
want: want{version: "22.2.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-23.0.90",
|
||||
args: args{ref: "emacs-pretest-23.0.90"},
|
||||
want: want{version: "23.0.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-23.1.90",
|
||||
args: args{ref: "emacs-pretest-23.1.90"},
|
||||
want: want{version: "23.1.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-23.2.90",
|
||||
args: args{ref: "emacs-pretest-23.2.90"},
|
||||
want: want{version: "23.2.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-23.2.91",
|
||||
args: args{ref: "emacs-pretest-23.2.91"},
|
||||
want: want{version: "23.2.91", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-23.2.93",
|
||||
args: args{ref: "emacs-pretest-23.2.93"},
|
||||
want: want{version: "23.2.93", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-23.2.93.1",
|
||||
args: args{ref: "emacs-pretest-23.2.93.1"},
|
||||
want: want{version: "23.2.93.1", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-23.3.90",
|
||||
args: args{ref: "emacs-pretest-23.3.90"},
|
||||
want: want{version: "23.3.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-24.0.05",
|
||||
args: args{ref: "emacs-pretest-24.0.05"},
|
||||
want: want{version: "24.0.05", channel: release.Pretest, err: ""},
|
||||
},
|
||||
{
|
||||
name: "emacs-pretest-24.0.90",
|
||||
args: args{ref: "emacs-pretest-24.0.90"},
|
||||
want: want{version: "24.0.90", channel: release.Pretest, err: ""},
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
got, gotChannel, err := parseGitRef(tt.args.ref)
|
||||
|
||||
assert.Equal(t, tt.want.version, got)
|
||||
assert.Equal(t, tt.want.channel, gotChannel)
|
||||
|
||||
if tt.want.err == "" {
|
||||
assert.NoError(t, err)
|
||||
} else {
|
||||
assert.EqualError(t, err, tt.want.err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import (
|
||||
"os"
|
||||
|
||||
"github.com/jimeh/build-emacs-for-macos/pkg/osinfo"
|
||||
"github.com/jimeh/build-emacs-for-macos/pkg/release"
|
||||
"github.com/jimeh/build-emacs-for-macos/pkg/source"
|
||||
"gopkg.in/yaml.v3"
|
||||
)
|
||||
@@ -78,10 +79,11 @@ type Build struct {
|
||||
}
|
||||
|
||||
type Release struct {
|
||||
Name string `yaml:"name" json:"name"`
|
||||
Title string `yaml:"title,omitempty" json:"title,omitempty"`
|
||||
Draft bool `yaml:"draft,omitempty" json:"draft,omitempty"`
|
||||
Prerelease bool `yaml:"prerelease,omitempty" json:"prerelease,omitempty"`
|
||||
Name string `yaml:"name" json:"name"`
|
||||
Title string `yaml:"title,omitempty" json:"title,omitempty"`
|
||||
Draft bool `yaml:"draft,omitempty" json:"draft,omitempty"`
|
||||
Prerelease bool `yaml:"prerelease,omitempty" json:"prerelease,omitempty"`
|
||||
Channel release.Channel `yaml:"channel,omitempty" json:"channel,omitempty"`
|
||||
}
|
||||
|
||||
type Output struct {
|
||||
|
||||
11
pkg/release/channel.go
Normal file
11
pkg/release/channel.go
Normal file
@@ -0,0 +1,11 @@
|
||||
package release
|
||||
|
||||
type Channel string
|
||||
|
||||
// Release channels
|
||||
const (
|
||||
Stable Channel = "stable"
|
||||
RC Channel = "release-candidate"
|
||||
Pretest Channel = "pretest"
|
||||
Nightly Channel = "nightly"
|
||||
)
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"regexp"
|
||||
"strings"
|
||||
)
|
||||
|
||||
// Errors
|
||||
@@ -18,7 +19,7 @@ var (
|
||||
|
||||
var (
|
||||
stableVersion = regexp.MustCompile(`^\d+\.\d+(?:[a-z]+)?$`)
|
||||
stableGetRef = regexp.MustCompile(`^emacs-(\d+\.\d+(?:[a-z]+)?)$`)
|
||||
stableGitRef = regexp.MustCompile(`^emacs-(\d+\.\d+(?:[a-z]+)?)$`)
|
||||
)
|
||||
|
||||
func VersionToName(version string) (string, error) {
|
||||
@@ -26,7 +27,8 @@ func VersionToName(version string) (string, error) {
|
||||
return "", ErrEmptyVersion
|
||||
}
|
||||
|
||||
if stableVersion.MatchString(version) {
|
||||
if stableVersion.MatchString(version) ||
|
||||
strings.HasSuffix(version, "-pretest") {
|
||||
return "Emacs-" + version, nil
|
||||
}
|
||||
|
||||
@@ -34,7 +36,7 @@ func VersionToName(version string) (string, error) {
|
||||
}
|
||||
|
||||
func GitRefToStableVersion(ref string) (string, error) {
|
||||
if m := stableGetRef.FindStringSubmatch(ref); len(m) > 1 {
|
||||
if m := stableGitRef.FindStringSubmatch(ref); len(m) > 1 {
|
||||
return m[1], nil
|
||||
}
|
||||
|
||||
|
||||
@@ -128,3 +128,15 @@ func (s *Repository) ActionRunURL(runID string) string {
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
func (s *Repository) ReleaseURL(releaseName string) string {
|
||||
if releaseName == "" {
|
||||
return ""
|
||||
}
|
||||
switch s.Type {
|
||||
case GitHub:
|
||||
return GitHubBaseURL + s.Source + "/releases/tag/" + releaseName
|
||||
default:
|
||||
return ""
|
||||
}
|
||||
}
|
||||
|
||||
54
pkg/repository/repository_test.go
Normal file
54
pkg/repository/repository_test.go
Normal file
@@ -0,0 +1,54 @@
|
||||
package repository
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestRepository_ReleaseURL(t *testing.T) {
|
||||
type fields struct {
|
||||
Type Type
|
||||
Source string
|
||||
}
|
||||
type args struct {
|
||||
releaseName string
|
||||
}
|
||||
tests := []struct {
|
||||
name string
|
||||
fields fields
|
||||
args args
|
||||
want string
|
||||
}{
|
||||
{
|
||||
name: "empty name",
|
||||
fields: fields{Type: GitHub, Source: "foo/bar"},
|
||||
args: args{releaseName: ""},
|
||||
want: "",
|
||||
},
|
||||
{
|
||||
name: "GitHub, foo/bar, v1.0.0",
|
||||
fields: fields{Type: GitHub, Source: "foo/bar"},
|
||||
args: args{releaseName: "v1.0.0"},
|
||||
want: "https://github.com/foo/bar/releases/tag/v1.0.0",
|
||||
},
|
||||
{
|
||||
name: "Not GitHub, foo/bar, v1.0.0",
|
||||
fields: fields{Type: Type("oops"), Source: "foo/bar"},
|
||||
args: args{releaseName: "v1.0.0"},
|
||||
want: "",
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
t.Run(tt.name, func(t *testing.T) {
|
||||
repo := &Repository{
|
||||
Type: tt.fields.Type,
|
||||
Source: tt.fields.Source,
|
||||
}
|
||||
|
||||
got := repo.ReleaseURL(tt.args.releaseName)
|
||||
|
||||
assert.Equal(t, tt.want, got)
|
||||
})
|
||||
}
|
||||
}
|
||||
9
pkg/sanitize/string.go
Normal file
9
pkg/sanitize/string.go
Normal file
@@ -0,0 +1,9 @@
|
||||
package sanitize
|
||||
|
||||
import "regexp"
|
||||
|
||||
var nonAlphaNum = regexp.MustCompile(`[^\w_-]+`)
|
||||
|
||||
func String(s string) string {
|
||||
return nonAlphaNum.ReplaceAllString(s, "-")
|
||||
}
|
||||
@@ -14,6 +14,7 @@ var DefaultEmacsEntitlements = []string{
|
||||
"com.apple.security.cs.allow-jit",
|
||||
"com.apple.security.network.client",
|
||||
"com.apple.security.cs.disable-library-validation",
|
||||
"com.apple.security.cs.allow-dyld-environment-variables",
|
||||
"com.apple.security.automation.apple-events",
|
||||
}
|
||||
|
||||
|
||||
@@ -50,6 +50,7 @@ var entitlementsTestCases = []struct {
|
||||
"com.apple.security.cs.allow-jit",
|
||||
"com.apple.security.network.client",
|
||||
"com.apple.security.cs.disable-library-validation",
|
||||
"com.apple.security.cs.allow-dyld-environment-variables",
|
||||
"com.apple.security.automation.apple-events",
|
||||
},
|
||||
//nolint:lll
|
||||
@@ -64,6 +65,8 @@ var entitlementsTestCases = []struct {
|
||||
<true/>
|
||||
<key>com.apple.security.cs.disable-library-validation</key>
|
||||
<true/>
|
||||
<key>com.apple.security.cs.allow-dyld-environment-variables</key>
|
||||
<true/>
|
||||
<key>com.apple.security.automation.apple-events</key>
|
||||
<true/>
|
||||
</dict>
|
||||
@@ -78,6 +81,7 @@ func TestDefaultEmacsEntitlements(t *testing.T) {
|
||||
"com.apple.security.cs.allow-jit",
|
||||
"com.apple.security.network.client",
|
||||
"com.apple.security.cs.disable-library-validation",
|
||||
"com.apple.security.cs.allow-dyld-environment-variables",
|
||||
"com.apple.security.automation.apple-events",
|
||||
},
|
||||
DefaultEmacsEntitlements,
|
||||
|
||||
Reference in New Issue
Block a user