diff --git a/.github/workflows/_build_artifacts.yml b/.github/workflows/_build_artifacts.yml index 59523aaef..5e89a9956 100644 --- a/.github/workflows/_build_artifacts.yml +++ b/.github/workflows/_build_artifacts.yml @@ -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 }} diff --git a/.github/workflows/_deploy_production.yml b/.github/workflows/_deploy_production.yml index 1d1f3a817..287759c75 100644 --- a/.github/workflows/_deploy_production.yml +++ b/.github/workflows/_deploy_production.yml @@ -11,7 +11,7 @@ on: env: # mark:automatic-version - VERSION: "1.0.0" + VERSION: "1.0.1" concurrency: group: "production-deploy" diff --git a/.github/workflows/_static-analysis.yml b/.github/workflows/_static-analysis.yml index f04b5343d..4bb7b0431 100644 --- a/.github/workflows/_static-analysis.yml +++ b/.github/workflows/_static-analysis.yml @@ -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: diff --git a/.github/workflows/_tauri.yml b/.github/workflows/_tauri.yml index b45019a9d..e4dd29e2f 100644 --- a/.github/workflows/_tauri.yml +++ b/.github/workflows/_tauri.yml @@ -14,7 +14,7 @@ permissions: env: # mark:automatic-version - VERSION: "1.0.0" + VERSION: "1.0.1" defaults: run: diff --git a/.github/workflows/_terraform.yml b/.github/workflows/_terraform.yml index 7bbfe2f54..99b1f1a18 100644 --- a/.github/workflows/_terraform.yml +++ b/.github/workflows/_terraform.yml @@ -4,7 +4,7 @@ on: env: # mark:automatic-version - VERSION: "1.0.0" + VERSION: "1.0.1" jobs: plan-deploy: diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index f3b2f0d3f..a11c54638 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9a0715d66..87349ad41 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 30b56db76..53cd44d61 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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 }}" diff --git a/elixir/VERSION b/elixir/VERSION index 3eefcb9dd..7dea76edb 100644 --- a/elixir/VERSION +++ b/elixir/VERSION @@ -1 +1 @@ -1.0.0 +1.0.1 diff --git a/kotlin/android/app/build.gradle.kts b/kotlin/android/app/build.gradle.kts index 7fceb98fc..7dffd925c 100644 --- a/kotlin/android/app/build.gradle.kts +++ b/kotlin/android/app/build.gradle.kts @@ -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" } diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 141d01dba..4fa2ba04b 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -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", diff --git a/rust/connlib/clients/android/Cargo.toml b/rust/connlib/clients/android/Cargo.toml index bf1c6db5e..30b677e33 100644 --- a/rust/connlib/clients/android/Cargo.toml +++ b/rust/connlib/clients/android/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "connlib-client-android" # mark:automatic-version -version = "1.0.0" +version = "1.0.1" edition = "2021" [lib] diff --git a/rust/connlib/clients/apple/Cargo.toml b/rust/connlib/clients/apple/Cargo.toml index 799435bc5..9b8d104da 100644 --- a/rust/connlib/clients/apple/Cargo.toml +++ b/rust/connlib/clients/apple/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "connlib-client-apple" # mark:automatic-version -version = "1.0.0" +version = "1.0.1" edition = "2021" [features] diff --git a/rust/connlib/clients/shared/Cargo.toml b/rust/connlib/clients/shared/Cargo.toml index 091fdc72c..ee3ac0f98 100644 --- a/rust/connlib/clients/shared/Cargo.toml +++ b/rust/connlib/clients/shared/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "connlib-client-shared" # mark:automatic-version -version = "1.0.0" +version = "1.0.1" edition = "2021" [features] diff --git a/rust/connlib/shared/Cargo.toml b/rust/connlib/shared/Cargo.toml index 96bcaac2a..5a42e4e08 100644 --- a/rust/connlib/shared/Cargo.toml +++ b/rust/connlib/shared/Cargo.toml @@ -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 diff --git a/rust/connlib/snownet/Cargo.toml b/rust/connlib/snownet/Cargo.toml index 34749c01e..8bcda5255 100644 --- a/rust/connlib/snownet/Cargo.toml +++ b/rust/connlib/snownet/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "snownet" # mark:automatic-version -version = "1.0.0" +version = "1.0.1" edition = "2021" [dependencies] diff --git a/rust/connlib/tunnel/Cargo.toml b/rust/connlib/tunnel/Cargo.toml index 66357858d..9fe8d87de 100644 --- a/rust/connlib/tunnel/Cargo.toml +++ b/rust/connlib/tunnel/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "firezone-tunnel" # mark:automatic-version -version = "1.0.0" +version = "1.0.1" edition = "2021" [dependencies] diff --git a/rust/firezone-cli-utils/Cargo.toml b/rust/firezone-cli-utils/Cargo.toml index 35a5c61a8..760a79fc0 100644 --- a/rust/firezone-cli-utils/Cargo.toml +++ b/rust/firezone-cli-utils/Cargo.toml @@ -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 diff --git a/rust/gateway/Cargo.toml b/rust/gateway/Cargo.toml index 9cf21ac51..d1d0f5a9d 100644 --- a/rust/gateway/Cargo.toml +++ b/rust/gateway/Cargo.toml @@ -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 diff --git a/rust/gui-client/src-tauri/Cargo.toml b/rust/gui-client/src-tauri/Cargo.toml index d6468724d..0ec39d227 100644 --- a/rust/gui-client/src-tauri/Cargo.toml +++ b/rust/gui-client/src-tauri/Cargo.toml @@ -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" diff --git a/rust/headless-client/Cargo.toml b/rust/headless-client/Cargo.toml index 7504a9c20..0c388aa5e 100644 --- a/rust/headless-client/Cargo.toml +++ b/rust/headless-client/Cargo.toml @@ -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."] diff --git a/rust/http-health-check/Cargo.toml b/rust/http-health-check/Cargo.toml index fda71f7e9..c19da9fc1 100644 --- a/rust/http-health-check/Cargo.toml +++ b/rust/http-health-check/Cargo.toml @@ -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 diff --git a/rust/http-test-server/Cargo.toml b/rust/http-test-server/Cargo.toml index cbbcefc48..cd13136ec 100644 --- a/rust/http-test-server/Cargo.toml +++ b/rust/http-test-server/Cargo.toml @@ -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 diff --git a/rust/ip-packet/Cargo.toml b/rust/ip-packet/Cargo.toml index 5d9294148..93be6619b 100644 --- a/rust/ip-packet/Cargo.toml +++ b/rust/ip-packet/Cargo.toml @@ -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 diff --git a/rust/linux-client/Cargo.toml b/rust/linux-client/Cargo.toml index f0b4fc6f2..a3c2e3656 100644 --- a/rust/linux-client/Cargo.toml +++ b/rust/linux-client/Cargo.toml @@ -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."] diff --git a/rust/phoenix-channel/Cargo.toml b/rust/phoenix-channel/Cargo.toml index 56509e6b0..c3dde2d85 100644 --- a/rust/phoenix-channel/Cargo.toml +++ b/rust/phoenix-channel/Cargo.toml @@ -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 diff --git a/rust/relay/Cargo.toml b/rust/relay/Cargo.toml index 98a9a6a6f..c2f816d96 100644 --- a/rust/relay/Cargo.toml +++ b/rust/relay/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "firezone-relay" # mark:automatic-version -version = "1.0.0" +version = "1.0.1" edition = "2021" [dependencies] diff --git a/rust/snownet-tests/Cargo.toml b/rust/snownet-tests/Cargo.toml index 99206decd..fca136924 100644 --- a/rust/snownet-tests/Cargo.toml +++ b/rust/snownet-tests/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "snownet-tests" # mark:automatic-version -version = "1.0.0" +version = "1.0.1" edition = "2021" [dependencies] diff --git a/scripts/Makefile b/scripts/Makefile index abdd208f0..ff646294f 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -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 diff --git a/swift/apple/Firezone.xcodeproj/project.pbxproj b/swift/apple/Firezone.xcodeproj/project.pbxproj index b7d60f161..6ec0f0725 100644 --- a/swift/apple/Firezone.xcodeproj/project.pbxproj +++ b/swift/apple/Firezone.xcodeproj/project.pbxproj @@ -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)";