Skip to content
Open
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
12 changes: 6 additions & 6 deletions .github/workflows/ci-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ jobs:
test-e2e:
name: Run end-to-end tests
if: ${{ needs.changes.outputs.backend == 'true' }}
runs-on: oracle-vm-16cpu-64gb-x86-64
runs-on: ${{ github.repository == 'argoproj/argo-cd' && 'oracle-vm-16cpu-64gb-x86-64' || 'ubuntu-22.04' }}
strategy:
fail-fast: false
matrix:
Expand All @@ -432,7 +432,7 @@ jobs:
- build-go
- changes
env:
GOPATH: /home/ubuntu/go
GOPATH: ${{ github.repository == 'argoproj/argo-cd' && '/home/ubuntu/go' || '/home/runner/go' }}
ARGOCD_FAKE_IN_CLUSTER: 'true'
ARGOCD_SSH_DATA_PATH: '/tmp/argo-e2e/app/config/ssh'
ARGOCD_TLS_DATA_PATH: '/tmp/argo-e2e/app/config/tls'
Expand Down Expand Up @@ -468,9 +468,9 @@ jobs:
set -x
curl -sfL https://get.k3s.io | sh -
sudo chmod -R a+rw /etc/rancher/k3s
sudo mkdir -p $HOME/.kube && sudo chown -R ubuntu $HOME/.kube
sudo mkdir -p $HOME/.kube && sudo chown -R $(whoami) $HOME/.kube
sudo k3s kubectl config view --raw > $HOME/.kube/config
sudo chown ubuntu $HOME/.kube/config
sudo chown $(whoami) $HOME/.kube/config
sudo chmod go-r $HOME/.kube/config
kubectl version
- name: Restore go build cache
Expand All @@ -480,7 +480,7 @@ jobs:
key: ${{ runner.os }}-go-build-v1-${{ github.run_id }}
- name: Add ~/go/bin to PATH
run: |
echo "/home/ubuntu/go/bin" >> $GITHUB_PATH
echo "$HOME/go/bin" >> $GITHUB_PATH
- name: Add /usr/local/bin to PATH
run: |
echo "/usr/local/bin" >> $GITHUB_PATH
Expand All @@ -506,7 +506,7 @@ jobs:
- name: Create target directory for binaries in the build-process
run: |
mkdir -p dist
chown ubuntu dist
chown $(whoami) dist
- name: Run E2E server and wait for it being available
timeout-minutes: 30
run: |
Expand Down
6 changes: 3 additions & 3 deletions hack/trigger-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ if echo "${REMOTE_URL}" | grep -q "argoproj/argo-cd"; then
echo "!! 1. Press Ctrl+C now" >&2
echo "!! 2. Use your fork remote: ./hack/trigger-release.sh ${NEW_TAG} origin" >&2
echo "!!" >&2
echo "!! To proceed with OFFICIAL release, type 'OFFICIAL' (30 second timeout):" >&2
echo "!! To proceed with OFFICIAL release, type 'y' (30 second timeout):" >&2
read -t 30 -r confirmation
if [ "$confirmation" != "OFFICIAL" ]; then
echo "!! Cancelled. Did not receive 'OFFICIAL' confirmation." >&2
if [ "$confirmation" != "y" ]; then
echo "!! Cancelled. Did not receive 'y' confirmation." >&2
exit 1
fi
echo ">> Confirmed official release. Proceeding..." >&2
Expand Down
Loading