From d4de8a3e2812bbd0924644566478ee71c36f4ecf Mon Sep 17 00:00:00 2001 From: Katrina Prosise Date: Thu, 30 Apr 2026 05:51:50 -0400 Subject: [PATCH] Fix issues around fioctl_version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes included adding an `export` to the fioctl install steps, updating the download URL, and switching to always using the latest. This commit addresses issue FFTK-4779, "fix fioctl version…" Signed-off-by: Katrina Prosise --- .github/workflows/publish-dev.yml | 3 +-- .github/workflows/publish-main.yml | 3 +-- source/conf.py | 4 +--- .../getting-started/install-fioctl/index.rst | 18 +++++------------- 4 files changed, 8 insertions(+), 20 deletions(-) diff --git a/.github/workflows/publish-dev.yml b/.github/workflows/publish-dev.yml index dfcbfbdc..de6aada7 100644 --- a/.github/workflows/publish-dev.yml +++ b/.github/workflows/publish-dev.yml @@ -36,8 +36,7 @@ jobs: - name: Add latest Fioctl docs run: | - export fv=$(wget -q -O- https://api.github.com/repos/foundriesio/fioctl/releases/latest | grep tag_name | sed -E 's/.*"([^"]+)".*/\1/') - wget -O /tmp/fioctl https://github.com/foundriesio/fioctl/releases/download/${fv}/fioctl-linux-amd64 + wget -O /tmp/fioctl https://github.com/foundriesio/fioctl/releases/latest/download/fioctl-linux-amd64 chmod +x /tmp/fioctl /tmp/fioctl gen-rst source/appendix/fioctl-command-reference/ diff --git a/.github/workflows/publish-main.yml b/.github/workflows/publish-main.yml index 83a380af..522c3269 100644 --- a/.github/workflows/publish-main.yml +++ b/.github/workflows/publish-main.yml @@ -31,8 +31,7 @@ jobs: - name: Add latest Fioctl docs run: | - export fv=$(wget -q -O- https://api.github.com/repos/foundriesio/fioctl/releases/latest | grep tag_name | sed -E 's/.*"([^"]+)".*/\1/') - wget -O /tmp/fioctl https://github.com/foundriesio/fioctl/releases/download/${fv}/fioctl-linux-amd64 + wget -O /tmp/fioctl https://github.com/foundriesio/fioctl/releases/latest/download/fioctl-linux-amd64 chmod +x /tmp/fioctl /tmp/fioctl gen-rst source/appendix/fioctl-command-reference/ diff --git a/source/conf.py b/source/conf.py index ccb66a79..e98faa1a 100644 --- a/source/conf.py +++ b/source/conf.py @@ -19,7 +19,6 @@ mp_version = os.environ.get('MP_UPDATE_VERSION') lmp_build = os.environ.get('LMP_BUILD') -fioctl_version = os.environ.get('fv') if mp_version is None: try: git_version = subprocess.check_output(['git', 'describe', '--tags']) @@ -213,8 +212,7 @@ rst_epilog = ''' .. |docker_tag| replace:: {} .. |manifest_tag| replace:: {} -.. |fioctl_version| replace:: {} -'''.format(docker_tag, manifest_tag, fioctl_version) +'''.format(docker_tag, manifest_tag) # -- PDF Configuration -------------------------------------------------------- diff --git a/source/getting-started/install-fioctl/index.rst b/source/getting-started/install-fioctl/index.rst index dc0ad95e..9b5bf92f 100644 --- a/source/getting-started/install-fioctl/index.rst +++ b/source/getting-started/install-fioctl/index.rst @@ -47,17 +47,13 @@ We use `GitHub Releases`_ to distribute static golang binaries. .. attention:: Make sure you have ``curl`` installed. 1. Download a Linux binary to a directory on your ``PATH``. - For example, to download version |fioctl_version| on Linux, define the version: - - .. parsed-literal:: - - FIOCTL_VERSION="|fioctl_version|" + For example, to download the latest version on Linux: Download the binary with curl: .. code-block:: console - $ sudo curl -o /usr/local/bin/fioctl -LO https://github.com/foundriesio/fioctl/releases/download/$FIOCTL_VERSION/fioctl-linux-amd64 + $ sudo curl -o /usr/local/bin/fioctl -LO https://github.com/foundriesio/fioctl/releases/latest/download/fioctl-linux-amd64 2. Make the :ref:`ref-fioctl` binary executable: @@ -73,21 +69,17 @@ We use `GitHub Releases`_ to distribute static golang binaries. 1. Download a Darwin binary from the `GitHub Releases`_ page to a directory on your ``PATH``. - For example, to download version |fioctl_version| on macOS, define the version: - - .. parsed-literal:: - - FIOCTL_VERSION="|fioctl_version|" + For example, to download the latest version on macOS: Download the binary with curl: .. code-block:: console - $ sudo curl -o /usr/local/bin/fioctl -L https://github.com/foundriesio/fioctl/releases/download/$FIOCTL_VERSION/fioctl-darwin-amd64 + $ sudo curl -o /usr/local/bin/fioctl -L https://github.com/foundriesio/fioctl/releases/latest/download/fioctl-darwin-amd64 .. important:: - For MacOS running on a Apple M1 processor, replace ``fioctl-darwin-amd64`` with ``fioctl-darwin-arm64``, and set ``FIOCTL_VERSION`` to v0.21 or newer. + For MacOS running on a Apple M1 processor, replace ``fioctl-darwin-amd64`` with ``fioctl-darwin-arm64``. 2. Make the :ref:`ref-fioctl` binary executable: