mirror of
https://github.com/outbackdingo/firezone.git
synced 2026-01-27 18:18:55 +00:00
7c70850217
Currently, `connlib` can only handle "simple" DNS wildcards where `*` matches any number of subdomains, including zero and `?` matches a single subdomain. With this PR, we expand `connlib'`s capabilities to allow for a much more complex matching of domains that more closely resembles glob patterns: - `**` matches any number of subdomains. This supersedes the previous `*` operator. - `*` matches a single subdomain. This supersedes the previous `?` operator. - `?` matches a single character. This wasn't possible before. - Additionally, any of these can be combined. Previously, only `*` or `?` was allowed and they were only accepted at the front of the domain name pattern. Resolves: #5056. --------- Signed-off-by: Thomas Eizinger <thomas@eizinger.io>
71 lines
4.3 KiB
Makefile
71 lines
4.3 KiB
Makefile
# Format: Semver
|
|
# See discussion here: https://github.com/firezone/firezone/issues/2041
|
|
# and PR changing it here: https://github.com/firezone/firezone/pull/2949
|
|
|
|
# Release Instructions:
|
|
# 1. Publish the appropriate drafted release on GitHub
|
|
# 2. Bump the appropriate version in this file
|
|
# 3. Run `make version`
|
|
# 4. Commit the changes
|
|
# 5. Open a PR with the changes
|
|
#
|
|
# CI will prevent pushing assets to releases that are published, so you need to bump
|
|
# the relevant versions in order to push to a newly drafted release.
|
|
|
|
# Tracks the current version to use for generating download links and changelogs
|
|
current-apple-version = 1.1.5
|
|
current-android-version = 1.1.6
|
|
current-gateway-version = 1.1.5
|
|
current-gui-version = 1.1.12
|
|
current-headless-version = 1.1.7
|
|
|
|
# Tracks the next version to release for each platform
|
|
next-apple-version = 1.2.0
|
|
next-android-version = 1.2.0
|
|
next-gateway-version = 1.2.0
|
|
next-gui-version = 1.2.0
|
|
next-headless-version = 1.2.0
|
|
|
|
# macOS uses a slightly different sed syntax
|
|
ifeq ($(shell uname),Darwin)
|
|
SEDARG := -i ''
|
|
else
|
|
SEDARG := -i
|
|
endif
|
|
|
|
.PHONY: apple-version android-version gateway-version gui-version headless-version version
|
|
|
|
apple-version:
|
|
@find website -name "redirects.js" -exec sed $(SEDARG) -e '/mark:current-apple-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(current-apple-version)/g;}' {} \;
|
|
@find .github -type f -exec sed $(SEDARG) -e '/mark:next-apple-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(next-apple-version)/g;}' {} \;
|
|
@find swift -type f -name "project.pbxproj" -exec sed $(SEDARG) -e 's/MARKETING_VERSION = .*;/MARKETING_VERSION = $(next-apple-version);/' {} \;
|
|
@find rust -path rust/gui-client/node_modules -prune -o -name "Cargo.toml" -exec sed $(SEDARG) -e '/mark:next-apple-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(next-apple-version)/;}' {} \;
|
|
@cd rust && cargo update --workspace
|
|
|
|
android-version:
|
|
@find website -name "redirects.js" -exec sed $(SEDARG) -e '/mark:current-android-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(current-android-version)/g;}' {} \;
|
|
@find .github -type f -exec sed $(SEDARG) -e '/mark:next-android-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(next-android-version)/g;}' {} \;
|
|
@find kotlin -type f -name "*.gradle.kts" -exec sed $(SEDARG) -e '/mark:next-android-version/{n;s/versionName =.*/versionName = "$(next-android-version)"/;}' {} \;
|
|
@find rust -path rust/gui-client/node_modules -prune -o -name "Cargo.toml" -exec sed $(SEDARG) -e '/mark:next-android-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(next-android-version)/;}' {} \;
|
|
@cd rust && cargo update --workspace
|
|
|
|
gateway-version:
|
|
@find website -name "redirects.js" -exec sed $(SEDARG) -e '/mark:current-gateway-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(current-gateway-version)/g;}' {} \;
|
|
@find .github -type f -exec sed $(SEDARG) -e '/mark:next-gateway-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(next-gateway-version)/g;}' {} \;
|
|
@find rust -path rust/gui-client/node_modules -prune -o -name "Cargo.toml" -exec sed $(SEDARG) -e '/mark:next-gateway-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(next-gateway-version)/;}' {} \;
|
|
@cd rust && cargo update --workspace
|
|
|
|
gui-version:
|
|
@find website -name "redirects.js" -exec sed $(SEDARG) -e '/mark:current-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(current-gui-version)/g;}' {} \;
|
|
@find .github -type f -exec sed $(SEDARG) -e '/mark:next-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(next-gui-version)/g;}' {} \;
|
|
@find rust -path rust/gui-client/node_modules -prune -o -name "Cargo.toml" -exec sed $(SEDARG) -e '/mark:next-gui-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(next-gui-version)/;}' {} \;
|
|
@cd rust && cargo update --workspace
|
|
|
|
headless-version:
|
|
@find website -name "redirects.js" -exec sed $(SEDARG) -e '/mark:current-headless-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(current-headless-version)/g;}' {} \;
|
|
@find .github -name "*.yml" -exec sed $(SEDARG) -e '/mark:next-headless-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(next-headless-version)/g;}' {} \;
|
|
@find rust -path rust/gui-client/node_modules -prune -o -name "Cargo.toml" -exec sed $(SEDARG) -e '/mark:next-headless-version/{n;s/[0-9]\{1,\}\.[0-9]\{1,\}\.[0-9]\{1,\}/$(next-headless-version)/;}' {} \;
|
|
@cd rust && cargo update --workspace
|
|
|
|
version: apple-version android-version gateway-version gui-version headless-version
|