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.

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

Add CocoaPods dependency manager #3994

Merged
merged 2 commits into from
Jun 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .azure-pipelines/LinuxAnalyzerTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ jobs:
mkdir -p $HOME/go/bin
curl https://raw.githubusercontent.com/golang/dep/v$GO_DEP_VERSION/install.sh | sh

# Install 'CocoaPods'. As https://github.com/CocoaPods/CocoaPods/pull/10609 is needed but not yet released, make a
# build from the latest revision of the master branch.
git clone https://github.com/CocoaPods/CocoaPods.git
fviernau marked this conversation as resolved.
Show resolved Hide resolved
cd CocoaPods
gem build cocoapods.gemspec
sudo gem install cocoapods-1.10.1.gem

# Update PATH for next steps, see:
# https://docs.microsoft.com/en-us/azure/devops/pipelines/scripts/logging-commands?view=azure-devops&tabs=bash#prependpath-prepend-a-path-to-the--path-environment-variable
echo "##vso[task.prependpath]$HOME/.local/bin"
Expand Down
12 changes: 11 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ ENV \
GOPATH=$HOME/go

ENV DEBIAN_FRONTEND=noninteractive \
PATH="$PATH:$HOME/.local/bin:$GOPATH/bin:/opt/go/bin"
PATH="$PATH:$HOME/.local/bin:$GOPATH/bin:/opt/go/bin:$GEM_PATH/bin"

# Apt install commands.
RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/apt \
Expand Down Expand Up @@ -110,6 +110,7 @@ RUN --mount=type=cache,target=/var/cache/apt --mount=type=cache,target=/var/lib/
python3-dev \
python3-pip \
python3-setuptools \
ruby-dev \
sbt=$SBT_VERSION \
&& \
rm -rf /var/lib/apt/lists/*
Expand Down Expand Up @@ -149,6 +150,15 @@ RUN /opt/ort/bin/import_proxy_certs.sh && \
SDK_MANAGER_PROXY_OPTIONS="--proxy=http --proxy_host=${PROXY_HOST_AND_PORT%:*} --proxy_port=${PROXY_HOST_AND_PORT##*:}"; \
fi && \
yes | $ANDROID_HOME/cmdline-tools/bin/sdkmanager $SDK_MANAGER_PROXY_OPTIONS --sdk_root=$ANDROID_HOME "platform-tools" && \
# Install 'CocoaPods'. As https://github.com/CocoaPods/CocoaPods/pull/10609 is needed but not yet released, make a
# build from the latest revision of the master branch.
git clone https://github.com/CocoaPods/CocoaPods.git && \
cd CocoaPods && \
git checkout 9461b346aeb8cba6df71fd4e71661688138ec21b && \
fviernau marked this conversation as resolved.
Show resolved Hide resolved
gem build cocoapods.gemspec && \
gem install cocoapods-1.10.1.gem && \
cd .. && \
rm -rf CocoaPods && \
# Add scanners (in versions known to work).
curl -ksSL https://github.com/nexB/scancode-toolkit/archive/v$SCANCODE_VERSION.tar.gz | \
tar -zxC /usr/local && \
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -322,6 +322,8 @@ Currently, the following package managers are supported:
* [Bundler](http://bundler.io/) (Ruby)
* [Cargo](https://doc.rust-lang.org/cargo/) (Rust)
* [Carthage](https://github.com/Carthage/Carthage) (iOS / Cocoa)
* [CocoaPods](https://github.com/CocoaPods/CocoaPods) (iOS / Cocoa, with currently some
[limitations](https://github.com/oss-review-toolkit/ort/issues/4188))
* [Composer](https://getcomposer.org/) (PHP)
* [Conan](https://conan.io/) (C / C++, *experimental* as the VCS locations often times do not contain the actual source
code, see [issue #2037](https://github.com/oss-review-toolkit/ort/issues/2037))
Expand Down
Empty file.
Loading