Skip to content

Use configFile option, support an additional repo deploy key #175

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
vyasr merged 21 commits into from
Mar 8, 2024
Merged

Use configFile option, support an additional repo deploy key #175

Changes from 19 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
0c3dfac
use configFile instead of copying the devcontainer up one level (http…
trxcllnt Jan 18, 2024
85f3e85
set subFolder
trxcllnt Jan 18, 2024
f1cb463
quote REPOSITORY envvar
trxcllnt Jan 18, 2024
85eb9ec
don't use subFolder
trxcllnt Jan 18, 2024
41e500a
don't change directories
trxcllnt Jan 18, 2024
7e6676c
define GH_TOKEN
trxcllnt Jan 18, 2024
8782b25
make gh_token the secret name
trxcllnt Jan 18, 2024
3181cdb
set REPOSITORY envvar again, don't set -e
trxcllnt Jan 29, 2024
787115a
do set -e and error on env creation again
trxcllnt Jan 29, 2024
ef4f68d
remove GH_TOKEN input
trxcllnt Feb 6, 2024
acf416d
support two repo deploy keys
trxcllnt Feb 6, 2024
62f0ee6
add the input
trxcllnt Feb 6, 2024
b5f6315
ssh-add with here-string
trxcllnt Feb 6, 2024
e5cde83
Merge branch 'branch-24.04' into fix/devcontainer-json-location
trxcllnt Feb 6, 2024
4f1ac3f
use single-quotes and grep with here strings
trxcllnt Feb 7, 2024
598e8cc
Merge branch 'fix/devcontainer-json-location' of github.com:rapidsai/…
trxcllnt Feb 7, 2024
92d5b04
Revert "use single-quotes and grep with here strings"
trxcllnt Feb 7, 2024
5130757
use single-quotes
trxcllnt Feb 7, 2024
1d839f7
Merge branch 'branch-24.04' into fix/devcontainer-json-location
trxcllnt Feb 7, 2024
82cd843
support passing in arch and cuda versions as JSON arrays
trxcllnt Feb 12, 2024
a3cceb5
Merge branch 'branch-24.04' into fix/devcontainer-json-location
trxcllnt Feb 21, 2024
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
26 changes: 16 additions & 10 deletions .github/workflows/build-in-devcontainer.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@ on:
required: false
type: string
default: ''
# Note that this is the _name_ of a secret containing the key, not the key itself.
extra-repo-deploy-key-2:
required: false
type: string
default: ''

permissions:
actions: read
Expand Down Expand Up @@ -53,6 +58,7 @@ jobs:
fetch-depth: 0
- name: Check if repo has devcontainer
run: |
echo "REPOSITORY=$(basename $(pwd))" | tee -a "${GITHUB_ENV}";
if test -f .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json; then
echo "HAS_DEVCONTAINER=true" >> "${GITHUB_ENV}";
else
Expand All @@ -69,17 +75,12 @@ jobs:
uses: actions/setup-node@v3
with:
node-version: '16'
- if: ${{ env.HAS_DEVCONTAINER == 'true' }}
name: Copy devcontainer.json file up one level
run: |
echo "REPOSITORY=$(basename $(pwd))" | tee -a "${GITHUB_ENV}";
cp .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json \
.devcontainer/devcontainer.json;
- if: ${{ env.HAS_DEVCONTAINER == 'true' }}
name: Run build in devcontainer
uses: devcontainers/ci@v0.3
with:
push: never
configFile: .devcontainer/cuda${{ matrix.cuda }}-${{ matrix.pkgr }}/devcontainer.json
env: |
REPOSITORY=${{ env.REPOSITORY }}
SCCACHE_REGION=${{ vars.AWS_REGION }}
Expand All @@ -88,18 +89,23 @@ jobs:
AWS_SECRET_ACCESS_KEY=${{ env.AWS_SECRET_ACCESS_KEY }}
runCmd: |
set -e;

mkdir -p ~/.config/pip/;
cat <<EOF >> ~/.config/pip/pip.conf
[global]
extra-index-url = https://pypi.anaconda.org/rapidsai-wheels-nightly/simple
EOF

rapids-make-${PYTHON_PACKAGE_MANAGER}-env || true;
rapids-make-${PYTHON_PACKAGE_MANAGER}-env;
Comment thread
trxcllnt marked this conversation as resolved.

if ! grep -qE "^$" <<< "${{ inputs.extra-repo-deploy-key }}"; then
if test -n '${{ inputs.extra-repo-deploy-key }}' \
|| test -n '${{ inputs.extra-repo-deploy-key-2 }}'; then
if ! pgrep ssh-agent >/dev/null 2>&1; then eval "$(ssh-agent -s)"; fi;
ssh-add - <<< "${{ secrets[inputs.extra-repo-deploy-key] }}";
if test -n '${{ inputs.extra-repo-deploy-key }}'; then
ssh-add - <<< '${{ secrets[inputs.extra-repo-deploy-key] }}';
fi
if test -n '${{ inputs.extra-repo-deploy-key-2 }}'; then
ssh-add - <<< '${{ secrets[inputs.extra-repo-deploy-key-2] }}';
fi
devcontainer-utils-init-ssh-deploy-keys || true;
fi

Expand Down