diff --git a/docs/releases.md b/docs/releases.md index 9a5dab6..9d62a19 100644 --- a/docs/releases.md +++ b/docs/releases.md @@ -15,7 +15,6 @@ Make sure you export the following environment variables: ```bash export GITHUB_TOKEN= export API_TOKEN_GITHUB= -export GHCR_PAT= export CI=true # So semantic-release actually runs ``` diff --git a/platform_cli/assets/Dockerfile.multi b/platform_cli/assets/Dockerfile.multi index 0a468fc..85b4a9c 100644 --- a/platform_cli/assets/Dockerfile.multi +++ b/platform_cli/assets/Dockerfile.multi @@ -15,7 +15,6 @@ ARG PLATFORM_MODULE="platform_module" LABEL org.opencontainers.image.source=https://github.com/Greenroom-Robotics/${PLATFORM_MODULE} -ENV GHCR_PAT=$API_TOKEN_GITHUB ENV PLATFORM_MODULE=$PLATFORM_MODULE RUN sudo mkdir /opt/greenroom && sudo chown ros:ros /opt/greenroom diff --git a/platform_cli/assets/Dockerfile.single b/platform_cli/assets/Dockerfile.single index d050320..438335c 100644 --- a/platform_cli/assets/Dockerfile.single +++ b/platform_cli/assets/Dockerfile.single @@ -4,7 +4,6 @@ ARG API_TOKEN_GITHUB ARG PACKAGE_NAME ARG PLATFORM_MODULE -ENV GHCR_PAT=$API_TOKEN_GITHUB ENV API_TOKEN_GITHUB=$API_TOKEN_GITHUB ENV PLATFORM_MODULE=$PLATFORM_MODULE diff --git a/platform_cli/groups/packaging.py b/platform_cli/groups/packaging.py index 39e4fc1..3fd85eb 100644 --- a/platform_cli/groups/packaging.py +++ b/platform_cli/groups/packaging.py @@ -6,7 +6,7 @@ import os from platform_cli.groups.base import PlatformCliGroup -from platform_cli.helpers import call, stdout_call, get_pkg_env, echo +from platform_cli.helpers import call, stdout_call, echo GR_APT_REPO_PRIVATE = "Greenroom-Robotics/packages" GR_APT_REPO_PUBLIC = "Greenroom-Robotics/public_packages" @@ -115,7 +115,6 @@ def refresh_deps(): # type: ignore reportUnusedFunction ) def install_deps(package: str): # type: ignore reportUnusedFunction """Installs rosdeps""" - get_pkg_env() package_dir = Path.cwd() packages = find_packages_with_colcon(package_dir) if package and package not in packages: diff --git a/platform_cli/helpers.py b/platform_cli/helpers.py index 701b2bc..4b2c085 100644 --- a/platform_cli/helpers.py +++ b/platform_cli/helpers.py @@ -11,10 +11,6 @@ class RosEnv(TypedDict): ROS_OVERLAY: str -class PkgEnv(TypedDict): - GHCR_PAT: str - - class LogLevels(Enum): WARNING = "warning" ERROR = "error" @@ -33,15 +29,6 @@ def get_ros_env() -> RosEnv: return cast(RosEnv, os.environ) -def get_pkg_env(abort: bool = True) -> PkgEnv: - if abort: - for env in PkgEnv.__required_keys__: # type: ignore - if env not in os.environ: - raise click.ClickException(f"{env} environment variable must be set.") - - return cast(PkgEnv, os.environ) - - def is_ci_environment() -> bool: return (os.environ.get("CI") or "").lower() == "true"