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

ci: Bump versions and fix release overwrites (#4769)

Browse Source
This commit is contained in:
Jamil
2024-04-24 11:43:19 -07:00
committed by GitHub
parent 0b83b12fd2
commit 5dc52edecc
30 changed files with 80 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -40,7 +40,7 @@ on:
env:
# mark:automatic-version
VERSION: "1.0.0"
VERSION: "1.0.1"
permissions:
# write permission is required to create a github release
@@ -175,7 +175,7 @@ jobs:
image_name: http-test-server
env:
# mark:automatic-version
BINARY_DEST_PATH: ${{ matrix.name.artifact }}_1.0.0_${{ matrix.arch.shortname }}
BINARY_DEST_PATH: ${{ matrix.name.artifact }}_1.0.1_${{ matrix.arch.shortname }}
outputs:
client_image: ${{ steps.image-name.outputs.client_image }}
relay_image: ${{ steps.image-name.outputs.relay_image }}

2
.github/workflows/_deploy_production.yml vendored
View File

@@ -11,7 +11,7 @@ on:
env:
# mark:automatic-version
VERSION: "1.0.0"
VERSION: "1.0.1"
concurrency:
group: "production-deploy"

17
.github/workflows/_static-analysis.yml vendored
View File

@@ -13,6 +13,23 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
version-check:
runs-on: macos-14
steps:
- uses: actions/checkout@v4
- name: Check version is up to date
run: |
make -f scripts/Makefile version
if [ -z "$(git status --porcelain)" ]; then
# Working directory clean
echo "Version manifests up to date"
else
# Uncommitted changes
echo '`make version` found outdated files! Showing diff'
git diff
exit 1
fi
link-check:
runs-on: ubuntu-22.04
steps:

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

@@ -14,7 +14,7 @@ permissions:
env:
# mark:automatic-version
VERSION: "1.0.0"
VERSION: "1.0.1"
defaults:
run:

2
.github/workflows/_terraform.yml vendored
View File

@@ -4,7 +4,7 @@ on:
env:
# mark:automatic-version
VERSION: "1.0.0"
VERSION: "1.0.1"
jobs:
plan-deploy:

2
.github/workflows/cd.yml vendored
View File

@@ -14,7 +14,7 @@ on:
env:
# mark:automatic-version
VERSION: "1.0.0"
VERSION: "1.0.1"
jobs:
# Builds images that match what's default in docker-compose.yml for

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

@@ -15,7 +15,7 @@ on:
env:
# mark:automatic-version
VERSION: "1.0.0"
VERSION: "1.0.1"
# Cancel old workflow runs if new code is pushed
concurrency:
@@ -48,29 +48,13 @@ jobs:
update-release-draft:
runs-on: ubuntu-22.04
outputs:
tag_name: ${{ steps.update-release-draft.outputs.tag_name }}
steps:
- uses: release-drafter/release-drafter@v6
id: update-release-draft
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
version: ${{ env.VERSION }}
commitish: ${{ github.base_ref }}
- name: Delete stale artifacts
# Build artifacts are only uploaded to the drafted release on `main` release builds, so only clear them in those cases too to prevent PRs from removing drafted release assets.
if: inputs.profile == 'release' && inputs.stage == 'release'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
set -xe
gh release view ${{ steps.update-release-draft.outputs.tag_name }} \
--repo ${{ github.repository }} \
--json assets \
--jq '.assets[] | .name' \
| xargs -I{} gh release delete-asset ${{ steps.update-release-draft.outputs.tag_name }} {} --repo ${{ github.repository }} --yes
outputs:
tag_name: ${{ steps.update-release-draft.outputs.tag_name }}
build-artifacts:
needs: update-release-draft

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

@@ -7,7 +7,7 @@ on:
env:
# mark:automatic-version
VERSION: "1.0.0"
VERSION: "1.0.1"
concurrency:
group: "publish-production-${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}"

2
elixir/VERSION
View File

@@ -1 +1 @@
1.0.0
1.0.1

2
kotlin/android/app/build.gradle.kts
View File

@@ -56,7 +56,7 @@ android {
targetSdk = 34
versionCode = (System.currentTimeMillis() / 1000 / 10).toInt()
// mark:automatic-version
versionName = "1.0.1"
versionName = "1.0.2"
multiDexEnabled = true
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}

34
rust/Cargo.lock generated
View File

@@ -1088,7 +1088,7 @@ dependencies = [
[[package]]
name = "connlib-client-android"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"connlib-client-shared",
"ip_network",
@@ -1107,7 +1107,7 @@ dependencies = [
[[package]]
name = "connlib-client-apple"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"connlib-client-shared",
"ip_network",
@@ -1126,7 +1126,7 @@ dependencies = [
[[package]]
name = "connlib-client-shared"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"anyhow",
"async-trait",
@@ -1154,7 +1154,7 @@ dependencies = [
[[package]]
name = "connlib-shared"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"anyhow",
"atomicwrites",
@@ -1846,7 +1846,7 @@ dependencies = [
[[package]]
name = "firezone-cli-utils"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"clap",
"tracing",
@@ -1857,7 +1857,7 @@ dependencies = [
[[package]]
name = "firezone-gateway"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"anyhow",
"async-trait",
@@ -1890,7 +1890,7 @@ dependencies = [
[[package]]
name = "firezone-gui-client"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"anyhow",
"arboard",
@@ -1943,7 +1943,7 @@ dependencies = [
[[package]]
name = "firezone-headless-client"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"anyhow",
"clap",
@@ -1968,7 +1968,7 @@ dependencies = [
[[package]]
name = "firezone-linux-client"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"anyhow",
"firezone-headless-client",
@@ -1976,7 +1976,7 @@ dependencies = [
[[package]]
name = "firezone-relay"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"anyhow",
"backoff",
@@ -2017,7 +2017,7 @@ dependencies = [
[[package]]
name = "firezone-tunnel"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"async-trait",
"bimap",
@@ -2847,7 +2847,7 @@ dependencies = [
[[package]]
name = "http-health-check"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"axum 0.7.5",
"clap",
@@ -2862,7 +2862,7 @@ checksum = "21dec9db110f5f872ed9699c3ecf50cf16f423502706ba5c72462e28d3157573"
[[package]]
name = "http-test-server"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"anyhow",
"axum 0.7.5",
@@ -3121,7 +3121,7 @@ dependencies = [
[[package]]
name = "ip-packet"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"pnet_packet",
]
@@ -4430,7 +4430,7 @@ dependencies = [
[[package]]
name = "phoenix-channel"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"backoff",
"base64 0.22.0",
@@ -5687,7 +5687,7 @@ dependencies = [
[[package]]
name = "snownet"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"backoff",
"boringtun",
@@ -5708,7 +5708,7 @@ dependencies = [
[[package]]
name = "snownet-tests"
version = "1.0.0"
version = "1.0.1"
dependencies = [
"anyhow",
"boringtun",

2
rust/connlib/clients/android/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "connlib-client-android"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
[lib]

2
rust/connlib/clients/apple/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "connlib-client-apple"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
[features]

2
rust/connlib/clients/shared/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "connlib-client-shared"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
[features]

2
rust/connlib/shared/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "connlib-shared"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
rust/connlib/snownet/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "snownet"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
[dependencies]

2
rust/connlib/tunnel/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-tunnel"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
[dependencies]

2
rust/firezone-cli-utils/Cargo.toml
View File

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

2
rust/gateway/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-gateway"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
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:automatic-version
version = "1.0.0"
version = "1.0.1"
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:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
authors = ["Firezone, Inc."]

2
rust/http-health-check/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "http-health-check"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
rust/http-test-server/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "http-test-server"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
rust/ip-packet/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "ip-packet"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
authors = ["Firezone, Inc."]
publish = false

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

@@ -1,7 +1,7 @@
[package]
name = "firezone-linux-client"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
authors = ["Firezone, Inc."]

2
rust/phoenix-channel/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "phoenix-channel"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
rust/relay/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "firezone-relay"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
[dependencies]

2
rust/snownet-tests/Cargo.toml
View File

@@ -1,7 +1,7 @@
[package]
name = "snownet-tests"
# mark:automatic-version
version = "1.0.0"
version = "1.0.1"
edition = "2021"
[dependencies]

19
scripts/Makefile
View File

@@ -1,11 +1,12 @@
# Format: Semver
# See discussion here: https://github.com/firezone/firezone/issues/2041
# and PR changing it here: https://github.com/firezone/firezone/pull/2949
apple-version = 1.0.2
android-version = 1.0.1
cargo-version = 1.0.0
elixir-version = 1.0.0
ci-version = 1.0.0
apple-version = 1.0.3
android-version = 1.0.2
cargo-version = 1.0.1
website-version = 1.0.0
elixir-version = 1.0.1
ci-version = 1.0.1
.PHONY: version apple-version android-version cargo-version ci-version elixir-version
@@ -21,9 +22,11 @@ apple-version:
android-version:
@find kotlin/ -name "*.gradle.kts" -exec sed $(SEDARG) -e '/mark:automatic-version/{n;s/versionName =.*/versionName = "$(android-version)"/;}' {} \;
cargo-version:
website-version:
@# The website hosts permalinks to our published packages and binaries
@find website/ -name "redirects.js" -exec sed $(SEDARG) -e '/mark:automatic-version/{n;s/[0-9]*\.[0-9]*\.[0-9]*/$(cargo-version)/g;}' {} \;
@find website/ -name "redirects.js" -exec sed $(SEDARG) -e '/mark:automatic-version/{n;s/[0-9]*\.[0-9]*\.[0-9]*/$(website-version)/g;}' {} \;
cargo-version:
@find rust/ -name "Cargo.toml" -exec sed $(SEDARG) -e '/mark:automatic-version/{n;s/[0-9]*\.[0-9]*\.[0-9]*/$(cargo-version)/;}' {} \;
@cd rust && cargo update --workspace
@@ -34,4 +37,4 @@ elixir-version:
@# Elixir can set its Application version from a file, but other components aren't so flexible.
@echo $(elixir-version) > elixir/VERSION
version: apple-version android-version cargo-version ci-version elixir-version
version: apple-version android-version cargo-version ci-version elixir-version website-version

12
swift/apple/Firezone.xcodeproj/project.pbxproj
View File

@@ -585,7 +585,7 @@
);
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/debug";
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-lconnlib";
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).debug.network-extension";
@@ -627,7 +627,7 @@
);
"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-ios/release";
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
OTHER_LDFLAGS = "-lconnlib";
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -671,7 +671,7 @@
"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/debug";
"LIBRARY_SEARCH_PATHS[arch=arm64e]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/debug";
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(CONNLIB_TARGET_DIR)/x86_64-apple-darwin/debug";
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
OTHER_LDFLAGS = "-lconnlib";
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).debug.network-extension";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -714,7 +714,7 @@
"LIBRARY_SEARCH_PATHS[arch=arm64]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/release";
"LIBRARY_SEARCH_PATHS[arch=arm64e]" = "$(CONNLIB_TARGET_DIR)/aarch64-apple-darwin/release";
"LIBRARY_SEARCH_PATHS[arch=x86_64]" = "$(CONNLIB_TARGET_DIR)/x86_64-apple-darwin/release";
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
OTHER_LDFLAGS = "-lconnlib";
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited).network-extension";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -908,7 +908,7 @@
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
OTHER_LDFLAGS = "";
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -959,7 +959,7 @@
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.0.3;
PRODUCT_BUNDLE_IDENTIFIER = "$(inherited)";
PRODUCT_MODULE_NAME = "$(PRODUCT_NAME:c99extidentifier)";
PRODUCT_NAME = "$(TARGET_NAME)";