Skip to content

[v10] update Makefile to use cargo sparse protocol in all cargo commands #23856 #24227

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

Merged
ibeckermayer merged 1 commit into from
Apr 7, 2023
Merged

[v10] update Makefile to use cargo sparse protocol in all cargo commands #23856 #24227

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
34 changes: 28 additions & 6 deletions .github/workflows/build-macos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,37 @@ jobs:
- name: Checkout Teleport
uses: actions/checkout@v3

- name: Get Go version
id: go-version
shell: bash
run: echo "go-version=$(make --no-print-directory print-go-version | tr -d '\n')" >> $GITHUB_OUTPUT
- name: Determine Toolchain Versions and cache paths
run: |
echo NODE_VERSION=$(make -C build.assets print-node-version) >> $GITHUB_ENV
echo GOLANG_VERSION=$(make -C build.assets print-go-version | sed 's/^go//') >> $GITHUB_ENV
echo RUST_VERSION=$(make -C build.assets print-rust-version) >> $GITHUB_ENV
echo PKG_CONFIG_PATH="$(build.assets/build-fido2-macos.sh pkg_config_path)" >> $GITHUB_ENV

- name: Setup Go
- name: Print versions
run: |
echo "make: $(make --version)"
echo "node: ${NODE_VERSION}"
echo "go: ${GOLANG_VERSION}"
echo "rust: ${RUST_VERSION}"

- name: Install Node Toolchain
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODE_VERSION }}

- name: Setup yarn
run: |
corepack enable yarn

- name: Install Go Toolchain
uses: actions/setup-go@v3
with:
go-version: ${{ steps.go-version.outputs.go-version }}
go-version: ${{ env.GOLANG_VERSION }}

- name: Configure Rust Toolchain
run: |
rustup override set ${{ env.RUST_VERSION }}

- name: Build
run: make binaries
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,11 @@ endif
CHECK_CARGO := $(shell cargo --version 2>/dev/null)
CHECK_RUST := $(shell rustc --version 2>/dev/null)

# Have cargo use sparse crates.io protocol:
# https://blog.rust-lang.org/2023/03/09/Rust-1.68.0.html
# TODO: Delete when it becomes default in Rust 1.70.0
export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse

with_rdpclient := no
RDPCLIENT_MESSAGE := "without Windows RDP client"

Expand Down