Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cleanup: remove unused credentials #18814

Merged
merged 1 commit into from
Mar 22, 2024
Merged

cleanup: remove unused credentials #18814

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions ci/build-unix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,6 @@ steps:
env:
DAML_SDK_RELEASE_VERSION: ${{parameters.release_tag}}
DAML_SCALA_VERSION: ${{parameters.scala_version}}
ARTIFACTORY_USERNAME: $(ARTIFACTORY_USERNAME)
ARTIFACTORY_PASSWORD: $(ARTIFACTORY_PASSWORD)
IS_FORK: $(System.PullRequest.IsFork)
condition: and(succeeded(),
eq(variables.skip, 'false'),
Expand Down
2 changes: 0 additions & 2 deletions ci/build-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,6 @@ steps:
displayName: 'Build'
env:
DAML_SDK_RELEASE_VERSION: ${{parameters.release_tag}}
ARTIFACTORY_USERNAME: $(ARTIFACTORY_USERNAME)
ARTIFACTORY_PASSWORD: $(ARTIFACTORY_PASSWORD)
# On release, we want to skip testing because:
# - Caching on Windows is keyed on full path, and full path is somewhat
# random (for a given machine, each pipeline has a its own workdir, but
Expand Down
2 changes: 0 additions & 2 deletions ci/cron/daily-compat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,6 @@ jobs:
fi
env:
GITHUB_TOKEN: $(CANTON_READONLY_TOKEN)
AUTH: $(ARTIFACTORY_USERNAME):$(ARTIFACTORY_PASSWORD)
GCRED: $(GOOGLE_APPLICATION_CREDENTIALS_CONTENT)

- job: compat_versions_pr
condition: or(eq(variables['Build.SourceBranchName'], 'main'),
Expand Down
4 changes: 0 additions & 4 deletions sdk/.envrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ eval "$(dev-env/bin/dade assist)"

DADE_PRE_COMMIT_HOOK_TYPE=pre-push

if [ -n "${ARTIFACTORY_USERNAME:-}" ] && [ -n "${ARTIFACTORY_PASSWORD:-}" ]; then
export ARTIFACTORY_AUTH=$(echo -n "$ARTIFACTORY_USERNAME:$ARTIFACTORY_PASSWORD" | base64 -w0)
fi

# always start from a clean slate to ensure that the install phase produces the scenario described by `DADE_NO_PRE_COMMIT` and `DADE_PRE_COMMIT_HOOK_TYPE`
# this is a bit unfortunate but it doesn't look like pre-commit currently supports uninstalling all hooks in one go as of version 2.20.0
HOOK_TYPES=(pre-commit pre-merge-commit pre-push prepare-commit-msg commit-msg post-checkout post-commit post-merge post-rewrite)
Expand Down
6 changes: 1 addition & 5 deletions sdk/bazel_tools/build_environment.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,19 @@ npm_version = "{NPM_VERSION}"
mvn_version = "{MVN_VERSION}"
ghc_version = "{GHC_VERSION}"
sdk_version = "{SDK_VERSION}"
artif_user = "{artif_user}"
artif_pass = "{artif_pass}"
""".format(
SDK_VERSION = semver,
NPM_VERSION = semver,
MVN_VERSION = semver,
GHC_VERSION = ghc,
artif_user = ctx.os.environ.get("ARTIFACTORY_USERNAME", default = ""),
artif_pass = ctx.os.environ.get("ARTIFACTORY_PASSWORD", default = ""),
),
executable = False,
)

build_environment = repository_rule(
# Tell Bazel that this rule will produce different results if any of the
# env vars in the list has changed.
environ = ["DAML_SDK_RELEASE_VERSION", "ARTIFACTORY_USERNAME", "ARTIFACTORY_PASSWORD"],
environ = ["DAML_SDK_RELEASE_VERSION"],
implementation = _impl,
attrs = {},
)