fix(signing): remove entitlements which I believe caused the app to not launch

The list of additional entitlements have been picked mostly on a
best-guess basis of what's reasonable.

Brewfile

@@ -3,7 +3,6 @@
 brew 'autoconf'
 brew 'coreutils'
 brew 'curl'
-brew 'dbus'
 brew 'expat'
 brew 'gcc'
 brew 'gmp'

CHANGELOG.md

@@ -2,20 +2,6 @@
 
 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.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)
 
 

pkg/cask/update.go

@@ -393,7 +393,9 @@ func (s *Updater) renderCask(
 		filename := asset.GetName()
 		s.logger.Debug("processing asset", "filename", filename)
 
-		filename = strings.TrimSuffix(filename, ".sha256")
+		if strings.HasSuffix(filename, ".sha256") {
+			filename = strings.TrimSuffix(filename, ".sha256")
+		}
 
 		if _, ok := info.Assets[filename]; !ok {
 			info.Assets[filename] = &ReleaseAsset{

pkg/plan/create.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"io"
 	"regexp"
-	"strconv"
 	"strings"
 
 	"github.com/hashicorp/go-hclog"
@@ -14,13 +13,10 @@ 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 gitTagMatcher = regexp.MustCompile(
-	`^emacs(-.*)?-((\d+\.\d+)(?:\.(\d+))?(-rc\d+)?(.+)?)$`,
-)
+var nonAlphaNum = regexp.MustCompile(`[^\w_-]+`)
 
 type TestBuildType string
 
@@ -41,7 +37,7 @@ type Options struct {
 	Output        io.Writer
 }
 
-func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
+func Create(ctx context.Context, opts *Options) (*Plan, error) {
 	logger := hclog.FromContext(ctx).Named("plan")
 
 	repo, err := repository.NewGitHub(opts.EmacsRepo)
@@ -70,36 +66,19 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
 		return nil, err
 	}
 
-	absoluteVersion := fmt.Sprintf(
+	version := fmt.Sprintf(
 		"%s.%s.%s",
 		commitInfo.DateString(),
 		commitInfo.ShortSHA(),
-		sanitize.String(opts.Ref),
+		sanitizeString(opts.Ref),
 	)
 
-	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
-	}
-
+	releaseName := fmt.Sprintf("Emacs.%s", version)
 	buildName := fmt.Sprintf(
 		"Emacs.%s.%s.%s",
-		absoluteVersion,
-		sanitize.String(osInfo.Name+"-"+osInfo.DistinctVersion()),
-		sanitize.String(osInfo.Arch),
+		version,
+		sanitizeString(osInfo.Name+"-"+osInfo.DistinctVersion()),
+		sanitizeString(osInfo.Arch),
 	)
 	diskImage := buildName + ".dmg"
 
@@ -118,8 +97,7 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
 		OS: osInfo,
 		Release: &Release{
 			Name:       releaseName,
-			Prerelease: channel != release.Stable,
-			Channel:    channel,
+			Prerelease: true,
 		},
 		Output: &Output{
 			Directory: opts.OutputDir,
@@ -127,18 +105,28 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
 		},
 	}
 
+	// 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 := sanitize.String(opts.TestBuild)
+		testName := sanitizeString(opts.TestBuild)
 
 		plan.Build.Name += ".test." + testName
-		plan.Release.Title = "Test Builds (" + testName + ")"
+		plan.Release.Title = "Test Builds"
 		plan.Release.Name = "test-builds"
 
-		plan.Release.Prerelease = false
-		plan.Release.Draft = true
-		if opts.TestBuildType == Prerelease {
-			plan.Release.Prerelease = true
-			plan.Release.Draft = false
+		plan.Release.Prerelease = true
+		plan.Release.Draft = false
+		if opts.TestBuildType == Draft {
+			plan.Release.Prerelease = false
+			plan.Release.Draft = true
 		}
 
 		index := strings.LastIndex(diskImage, ".")
@@ -149,35 +137,6 @@ func Create(ctx context.Context, opts *Options) (*Plan, error) { //nolint:funlen
 	return plan, nil
 }
 
-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
+func sanitizeString(s string) string {
+	return nonAlphaNum.ReplaceAllString(s, "-")
 }

pkg/plan/create_test.go

@@ -1,421 +0,0 @@
-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)
-			}
-		})
-	}
-}

pkg/plan/plan.go

@@ -7,7 +7,6 @@ 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"
 )
@@ -79,11 +78,10 @@ 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"`
-	Channel    release.Channel `yaml:"channel,omitempty" json:"channel,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"`
 }
 
 type Output struct {

pkg/release/channel.go

@@ -1,11 +0,0 @@
-package release
-
-type Channel string
-
-// Release channels
-const (
-	Stable  Channel = "stable"
-	RC      Channel = "release-candidate"
-	Pretest Channel = "pretest"
-	Nightly Channel = "nightly"
-)

pkg/release/version.go

@@ -18,7 +18,7 @@ var (
 
 var (
 	stableVersion = regexp.MustCompile(`^\d+\.\d+(?:[a-z]+)?$`)
-	stableGitRef  = regexp.MustCompile(`^emacs-(\d+\.\d+(?:[a-z]+)?)$`)
+	stableGetRef  = regexp.MustCompile(`^emacs-(\d+\.\d+(?:[a-z]+)?)$`)
 )
 
 func VersionToName(version string) (string, error) {
@@ -34,7 +34,7 @@ func VersionToName(version string) (string, error) {
 }
 
 func GitRefToStableVersion(ref string) (string, error) {
-	if m := stableGitRef.FindStringSubmatch(ref); len(m) > 1 {
+	if m := stableGetRef.FindStringSubmatch(ref); len(m) > 1 {
 		return m[1], nil
 	}
 

pkg/repository/repository.go

@@ -128,15 +128,3 @@ 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 ""
-	}
-}

pkg/repository/repository_test.go

@@ -1,54 +0,0 @@
-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)
-		})
-	}
-}

pkg/sanitize/string.go

@@ -1,9 +0,0 @@
-package sanitize
-
-import "regexp"
-
-var nonAlphaNum = regexp.MustCompile(`[^\w_-]+`)
-
-func String(s string) string {
-	return nonAlphaNum.ReplaceAllString(s, "-")
-}

pkg/sign/entitlements.go

@@ -11,11 +11,14 @@ import (
 // DefaultEmacsEntitlements is the default set of entitlements application
 // bundles are signed with if no entitlements are provided.
 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.developer.mail-client",
+	"com.apple.developer.web-browser",
 	"com.apple.security.automation.apple-events",
+	"com.apple.security.cs.allow-dyld-environment-variables",
+	"com.apple.security.cs.allow-jit",
+	"com.apple.security.cs.disable-library-validation",
+	"com.apple.security.network.client",
+	"com.apple.security.network.server",
 }
 
 //go:embed entitlements.tpl

pkg/sign/entitlements_test.go

@@ -47,11 +47,14 @@ var entitlementsTestCases = []struct {
 	{
 		name: "many",
 		entitlements: Entitlements{
-			"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.developer.mail-client",
+			"com.apple.developer.web-browser",
 			"com.apple.security.automation.apple-events",
+			"com.apple.security.cs.allow-dyld-environment-variables",
+			"com.apple.security.cs.allow-jit",
+			"com.apple.security.cs.disable-library-validation",
+			"com.apple.security.network.client",
+			"com.apple.security.network.server",
 		},
 		//nolint:lll
 		want: undent.String(`
@@ -59,15 +62,21 @@ var entitlementsTestCases = []struct {
             <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
             <plist version="1.0">
               <dict>
-                <key>com.apple.security.cs.allow-jit</key>
+                <key>com.apple.developer.mail-client</key>
                 <true/>
-                <key>com.apple.security.network.client</key>
+                <key>com.apple.developer.web-browser</key>
                 <true/>
-                <key>com.apple.security.cs.disable-library-validation</key>
+                <key>com.apple.security.automation.apple-events</key>
                 <true/>
                 <key>com.apple.security.cs.allow-dyld-environment-variables</key>
                 <true/>
-                <key>com.apple.security.automation.apple-events</key>
+                <key>com.apple.security.cs.allow-jit</key>
+                <true/>
+                <key>com.apple.security.cs.disable-library-validation</key>
+                <true/>
+                <key>com.apple.security.network.client</key>
+                <true/>
+                <key>com.apple.security.network.server</key>
                 <true/>
               </dict>
             </plist>`,
@@ -78,11 +87,14 @@ var entitlementsTestCases = []struct {
 func TestDefaultEmacsEntitlements(t *testing.T) {
 	assert.Equal(t,
 		[]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.developer.mail-client",
+			"com.apple.developer.web-browser",
 			"com.apple.security.automation.apple-events",
+			"com.apple.security.cs.allow-dyld-environment-variables",
+			"com.apple.security.cs.allow-jit",
+			"com.apple.security.cs.disable-library-validation",
+			"com.apple.security.network.client",
+			"com.apple.security.network.server",
 		},
 		DefaultEmacsEntitlements,
 	)