github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 18:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Bump versions to point to new artifacts (#5337)

Browse Source 
Currently dl links are broken due to the updated format.
This commit is contained in:
Jamil
2024-06-12 02:01:59 -05:00
committed by GitHub
parent a11697ca18
commit 8700a680d5
12 changed files with 61 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
.github/workflows/_build_artifacts.yml vendored
View File

@@ -153,9 +153,9 @@ jobs:
artifact: firezone-client-headless-linux
image_name: client
# mark:next-headless-version
version: 1.0.6
version: 1.0.7
# mark:next-headless-version
release_name: headless-client-1.0.6
release_name: headless-client-1.0.7
- package: firezone-relay
artifact: firezone-relay
image_name: relay
@@ -163,9 +163,9 @@ jobs:
artifact: firezone-gateway
image_name: gateway
# mark:next-gateway-version
version: 1.0.6
version: 1.1.0
# mark:next-gateway-version
release_name: gateway-1.0.6
release_name: gateway-1.1.0
- package: snownet-tests
artifact: snownet-tests
image_name: snownet-tests
@@ -340,7 +340,7 @@ jobs:
- name: relay
- name: gateway
# mark:next-gateway-version
version: 1.0.6
version: 1.1.0
- name: client
# mark:next-client-version
version: 1.0.6

16
.github/workflows/_tauri.yml vendored
View File

@@ -26,22 +26,22 @@ jobs:
include:
- runs-on: ubuntu-20.04
# mark:next-gui-version
binary-dest-path: firezone-client-gui-linux_1.0.6_x86_64
binary-dest-path: firezone-client-gui-linux_1.0.7_x86_64
rename-script: ../../scripts/build/tauri-rename-ubuntu.sh
upload-script: ../../scripts/build/tauri-upload-ubuntu.sh
# mark:next-gui-version
syms-artifact: rust/gui-client/firezone-client-gui-linux_1.0.6_x86_64.dwp
syms-artifact: rust/gui-client/firezone-client-gui-linux_1.0.7_x86_64.dwp
# mark:next-gui-version
pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.0.6_x86_64.deb
pkg-artifact: rust/gui-client/firezone-client-gui-linux_1.0.7_x86_64.deb
- runs-on: windows-2019
# mark:next-gui-version
binary-dest-path: firezone-client-gui-windows_1.0.6_x86_64
binary-dest-path: firezone-client-gui-windows_1.0.7_x86_64
rename-script: ../../scripts/build/tauri-rename-windows.sh
upload-script: ../../scripts/build/tauri-upload-windows.sh
# mark:next-gui-version
syms-artifact: rust/gui-client/firezone-client-gui-windows_1.0.6_x86_64.pdb
syms-artifact: rust/gui-client/firezone-client-gui-windows_1.0.7_x86_64.pdb
# mark:next-gui-version
pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.0.6_x86_64.msi
pkg-artifact: rust/gui-client/firezone-client-gui-windows_1.0.7_x86_64.msi
env:
BINARY_DEST_PATH: ${{ matrix.binary-dest-path }}
AZURE_KEY_VAULT_URI: ${{ secrets.AZURE_KEY_VAULT_URI }}
@@ -78,7 +78,7 @@ jobs:
if: ${{ runner.os == 'Windows' }}
shell: bash
# mark:next-gui-version
run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.0.6_x64_en-US.msi
run: ../../scripts/build/sign.sh ../target/release/bundle/msi/Firezone_1.0.7_x64_en-US.msi
- name: Rename artifacts and compute SHA256
shell: bash
run: ${{ matrix.rename-script }}
@@ -103,6 +103,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
REPOSITORY: ${{ github.repository }}
# mark:next-gui-version
TAG_NAME: gui-client-1.0.6
TAG_NAME: gui-client-1.0.7
shell: bash
run: ${{ matrix.upload-script }}

6
.github/workflows/ci.yml vendored
View File

@@ -46,13 +46,13 @@ jobs:
matrix:
include:
# mark:next-gateway-version
- release_name: gateway-1.0.6
- release_name: gateway-1.1.0
config_name: release-drafter-gateway.yml
# mark:next-headless-version
- release_name: headless-client-1.0.6
- release_name: headless-client-1.0.7
config_name: release-drafter-headless-client.yml
# mark:next-gui-version
- release_name: gui-client-1.0.6
- release_name: gui-client-1.0.7
config_name: release-drafter-gui-client.yml
steps:
- uses: release-drafter/release-drafter@v6

4
.github/workflows/publish.yml vendored
View File

@@ -45,11 +45,11 @@ jobs:
if [[ "${{ github.event.release.name }}" =~ gateway* ]]; then
image=gateway
# mark:next-gateway-version
VERSION="1.0.6"
VERSION="1.1.0"
elif [[ "${{ github.event.release.name }}" =~ headless* ]]; then
image=client
# mark:next-headless-version
VERSION="1.0.6"
VERSION="1.0.7"
else
echo "Release doesn't require publishing Docker images"
exit 0

12
elixir/apps/web/lib/web/live/relay_groups/new_token.ex
View File

@@ -221,16 +221,6 @@ defmodule Web.RelayGroups.NewToken do
"""
end
defp major_minor_version do
vsn =
Application.spec(:domain)
|> Keyword.fetch!(:vsn)
|> List.to_string()
|> Version.parse!()
"#{vsn.major}.#{vsn.minor}"
end
defp env(encoded_token) do
api_url_override =
if api_url = Domain.Config.get_env(:web, :api_url_override) do
@@ -279,7 +269,7 @@ defmodule Web.RelayGroups.NewToken do
"--device=\"/dev/net/tun:/dev/net/tun\"",
Enum.map(env, fn {key, value} -> "--env #{key}=\"#{value}\"" end),
"--env FIREZONE_NAME=$(hostname)",
"#{Domain.Config.fetch_env!(:domain, :docker_registry)}/relay:#{major_minor_version()}"
"#{Domain.Config.fetch_env!(:domain, :docker_registry)}/relay:latest"
]
|> List.flatten()
|> Enum.join(" \\\n ")

12
elixir/apps/web/lib/web/live/sites/new_token.ex
View File

@@ -178,16 +178,6 @@ defmodule Web.Sites.NewToken do
"""
end
defp major_minor_version do
vsn =
Application.spec(:domain)
|> Keyword.fetch!(:vsn)
|> List.to_string()
|> Version.parse!()
"#{vsn.major}.#{vsn.minor}"
end
defp env(encoded_token) do
api_url_override =
if api_url = Domain.Config.get_env(:web, :api_url_override) do
@@ -220,7 +210,7 @@ defmodule Web.Sites.NewToken do
"--env #{key}=\"#{value}\""
end),
"--env FIREZONE_NAME=$(hostname)",
"#{Domain.Config.fetch_env!(:domain, :docker_registry)}/gateway:#{major_minor_version()}"
"#{Domain.Config.fetch_env!(:domain, :docker_registry)}/gateway:1"
]
|> List.flatten()
|> Enum.join(" \\\n ")

6
rust/Cargo.lock generated
View File

@@ -1893,7 +1893,7 @@ dependencies = [
[[package]]
name = "firezone-gateway"
version = "1.0.6"
version = "1.1.0"
dependencies = [
"anyhow",
"async-trait",
@@ -1926,7 +1926,7 @@ dependencies = [
[[package]]
name = "firezone-gui-client"
version = "1.0.6"
version = "1.0.7"
dependencies = [
"anyhow",
"arboard",
@@ -1979,7 +1979,7 @@ dependencies = [
[[package]]
name = "firezone-headless-client"
version = "1.0.6"
version = "1.0.7"
dependencies = [
"anyhow",
"atomicwrites",

2
rust/gateway/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-gateway"
# mark:next-gateway-version
version = "1.0.6"
version = "1.1.0"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
rust/gui-client/src-tauri/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-gui-client"
# mark:next-gui-version
version = "1.0.6"
version = "1.0.7"
description = "Firezone"
edition = "2021"
default-run = "firezone-gui-client"

2
rust/headless-client/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-headless-client"
# mark:next-headless-version
version = "1.0.6"
version = "1.0.7"
edition = "2021"
authors = ["Firezone, Inc."]

58
scripts/Makefile
View File

@@ -10,61 +10,55 @@
# 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 to in order to push to a newly drafted release.
# 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.0.4
current-android-version = 1.0.2
current-gateway-version = 1.0.5
current-gui-version = 1.0.5
current-headless-version = 1.0.5
current-gateway-version = 1.0.6
current-gui-version = 1.0.6
current-headless-version = 1.0.6
# Tracks the next version to release for each platform
next-apple-version = 1.0.5
next-android-version = 1.0.3
next-gateway-version = 1.0.6
next-gui-version = 1.0.6
next-headless-version = 1.0.6
next-gateway-version = 1.1.0
next-gui-version = 1.0.7
next-headless-version = 1.0.7
# macOS uses a slightly different sed syntax
ifeq ($(shell uname),Darwin)
SEDARG := -i ''
SEDARG := -i ''
else
SEDARG := -i
SEDARG := -i
endif
.PHONY: version apple-version android-version cargo-version ci-version elixir-version
.PHONY: apple-version android-version gateway-version gui-version headless-version version
# Update website changelog and docs to current version and Xcode project file to next version
apple-version:
@find website/ -type f -path node_modules -prune -path .next -prune -exec sed $(SEDARG) -e '/mark:current-apple-version/{n;s/[0-9]+\.[0-9]+\.[0-9]+/$(current-apple-version)/g;}' {} \;
@find swift/ -type f -name "project.pbxproj" -exec sed $(SEDARG) -e 's/MARKETING_VERSION = .*;/MARKETING_VERSION = $(next-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 swift -type f -name "project.pbxproj" -exec sed $(SEDARG) -e 's/MARKETING_VERSION = .*;/MARKETING_VERSION = $(next-apple-version);/' {} \;
# Update website changelog to current version and Gradle files to next version
android-version:
@find website/ -type f -path node_modules -prune -path .next -prune -exec sed $(SEDARG) -e '/mark:current-android-version/{n;s/[0-9]+\.[0-9]+\.[0-9]+/$(current-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 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 kotlin -type f -name "*.gradle.kts" -exec sed $(SEDARG) -e '/mark:next-android-version/{n;s/versionName =.*/versionName = "$(next-android-version)"/;}' {} \;
# Update website changelog and DL links to current version and cargo files, CI release to next version
gateway-version:
@# The website hosts permalinks to our published packages and binaries
@find website/ -type f -path node_modules -prune -path .next -prune -exec sed $(SEDARG) -e '/mark:current-gateway-version/{n;s/[0-9]+\.[0-9]+\.[0-9]+/$(current-gateway-version)/g;}' {} \;
@find .github/ -type f -exec sed $(SEDARG) -e '/mark:next-gateway-version/{n;s/[0-9]+\.[0-9]+\.[0-9]+/$(next-gateway-version)/g;}' {} \;
# Update website changelog and DL links to current version and cargo files, CI release to next version
gui-version:
@# The website hosts permalinks to our published packages and binaries
@find website/ -type f -path node_modules -prune -path .next -prune -exec sed $(SEDARG) -e '/mark:current-gui-version/{n;s/[0-9]+\.[0-9]+\.[0-9]+/$(current-gui-version)/g;}' {} \;
@find .github/ -type f -exec sed $(SEDARG) -e '/mark:next-gui-version/{n;s/[0-9]+\.[0-9]+\.[0-9]+/$(next-gui-version)/g;}' {} \;
@find rust/ -type f -name "Cargo.toml" -exec sed $(SEDARG) -e '/mark:next-gui-version/{n;s/[0-9]+\.[0-9]+\.[0-9]+/$(next-gui-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
# Update website changelog and DL links to current version and cargo files, CI release to next version
headless-version:
@# The website hosts permalinks to our published packages and binaries
@find website/ -type f -path node_modules -prune -path .next -prune -exec sed $(SEDARG) -e '/mark:current-headless-version/{n;s/[0-9]+\.[0-9]+\.[0-9]+/$(current-headless-version)/g;}' {} \;
@find .github/ -type f -exec sed $(SEDARG) -e '/mark:next-headless-version/{n;s/[0-9]+\.[0-9]+\.[0-9]+/$(next-headless-version)/g;}' {} \;
@find rust/ -type f -name "Cargo.toml" -exec sed $(SEDARG) -e '/mark:next-headless-version/{n;s/[0-9]+\.[0-9]+\.[0-9]+/$(next-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

18
website/redirects.js
View File

@@ -11,7 +11,7 @@ module.exports = [
source: "/dl/firezone-client-gui-windows/latest/x86_64",
destination:
// mark:current-gui-version
"https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.5/firezone-client-gui-windows_1.0.5_x86_64.msi",
"https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.6/firezone-client-gui-windows_1.0.6_x86_64.msi",
permanent: false,
},
// versioned
@@ -31,35 +31,35 @@ module.exports = [
source: "/dl/firezone-client-gui-linux/latest/x86_64",
destination:
// mark:current-gui-version
"https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.5/firezone-client-gui-linux_1.0.5_x86_64.deb",
"https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.6/firezone-client-gui-linux_1.0.6_x86_64.deb",
permanent: false,
},
{
source: "/dl/firezone-client-gui-linux/latest/aarch64",
destination:
// mark:current-gui-version
"https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.5/firezone-client-gui-linux_1.0.5_aarch64.deb",
"https://www.github.com/firezone/firezone/releases/download/gui-client-1.0.6/firezone-client-gui-linux_1.0.6_aarch64.deb",
permanent: false,
},
{
source: "/dl/firezone-client-headless-linux/latest/x86_64",
destination:
// mark:current-headless-version
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.0.5/firezone-client-headless-linux_1.0.5_x86_64",
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.0.6/firezone-client-headless-linux_1.0.6_x86_64",
permanent: false,
},
{
source: "/dl/firezone-client-headless-linux/latest/aarch64",
destination:
// mark:current-headless-version
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.0.5/firezone-client-headless-linux_1.0.5_aarch64",
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.0.6/firezone-client-headless-linux_1.0.6_aarch64",
permanent: false,
},
{
source: "/dl/firezone-client-headless-linux/latest/armv7",
destination:
// mark:current-headless-version
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.0.5/firezone-client-headless-linux_1.0.5_armv7",
"https://www.github.com/firezone/firezone/releases/download/headless-client-1.0.6/firezone-client-headless-linux_1.0.6_armv7",
permanent: false,
},
// versioned
@@ -103,21 +103,21 @@ module.exports = [
source: "/dl/firezone-gateway/latest/x86_64",
destination:
// mark:current-gateway-version
"https://www.github.com/firezone/firezone/releases/download/gateway-1.0.5/firezone-gateway_1.0.5_x86_64",
"https://www.github.com/firezone/firezone/releases/download/gateway-1.0.6/firezone-gateway_1.0.6_x86_64",
permanent: false,
},
{
source: "/dl/firezone-gateway/latest/aarch64",
destination:
// mark:current-gateway-version
"https://www.github.com/firezone/firezone/releases/download/gateway-1.0.5/firezone-gateway_1.0.5_aarch64",
"https://www.github.com/firezone/firezone/releases/download/gateway-1.0.6/firezone-gateway_1.0.6_aarch64",
permanent: false,
},
{
source: "/dl/firezone-gateway/latest/armv7",
destination:
// mark:current-gateway-version
"https://www.github.com/firezone/firezone/releases/download/gateway-1.0.5/firezone-gateway_1.0.5_armv7",
"https://www.github.com/firezone/firezone/releases/download/gateway-1.0.6/firezone-gateway_1.0.6_armv7",
permanent: false,
},
// versioned