Skip to content

Commit

Permalink
Merge branch 'master' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
novoj committed Sep 13, 2024
2 parents a441498 + 0b07b34 commit 736cf22
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/benchmark-hook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v3

- name: Install doctl
uses: digitalocean/action-doctl@v2
Expand All @@ -30,25 +30,25 @@ jobs:
- name: Install kubectl
uses: azure/setup-kubectl@v3
with:
version: ${{ env.KUBECTL_VER }}
version: ${{ env.KUBECTL_VER }}

- name: Get Kubeconfig for DO cluster
run: |
export DO_CLUSTER_BENCHMARK_NAME="${DO_CLUSTER_NAME}-memory"
doctl k8s cluster kubeconfig show "${DO_CLUSTER_BENCHMARK_NAME}" > ${KUBECONFIG}
- name: Prep artifact for upload
- name: Prep artifact for upload
run: |
mkdir -p /tmp/logs
kubectl -n evita get events --sort-by=.metadata.creationTimestamp > /tmp/logs/${K8S_JOB_NAME}-events.txt || :
kubectl -n evita logs job/${K8S_JOB_NAME} -c benchmark > /tmp/logs/${K8S_JOB_NAME}-log.txt || :
- name: Archive logs from run
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: logs
path: /tmp/logs

- name: delete Kubernetes cluster in DO
run: |
export DO_CLUSTER_BENCHMARK_NAME="${DO_CLUSTER_NAME}-memory"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@ jobs:
jacoco/jacoco-summary.sh jacoco/target/site/jacoco-aggregate/jacoco.csv
- name: Upload test results # upload XML with unit test results to artifact `test-results` for `test-report.yml`
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: success() || failure()
with:
name: test-results
path: 'evita*/**/target/surefire-reports/TEST-*.xml'

- name: Upload evitaDB server artifact # upload `evita-server.jar` for `docker-canary.yml` to deploy to DockerHub
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: success()
with:
name: evita-server.jar
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-master.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,14 +121,14 @@ jobs:
asset_content_type: application/gzip

- name: Upload evitaDB server artifact # upload `evita-server.jar` for `docker-latest.yml` to deploy to DockerHub
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: success()
with:
name: evita-server.jar
path: 'evita_server/target/evita-server.jar'

- name: Upload evitaDB version.txt # upload `version.txt` for `docker-latest.yml` to deploy to DockerHub
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: success()
with:
name: version.txt
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/documentation-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: mvn -T 1C -B package -P documentation -Dsurefire.reportNameSuffix=documentation -V --fail-at-end -Dmaven.test.skip=false --file pom.xml

- name: Upload test results # this upload test results but only if something was committed this day
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: ${{ env.NEW_COMMIT_COUNT > 0 }} && (success() || failure())
with:
name: test-results
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/long-running-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
run: mvn -T 1C -B package -P longRunning -V --fail-at-end -Dmaven.test.skip=false --file pom.xml

- name: Upload test results # this upload test results but only if something was committed this day
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: ${{ env.NEW_COMMIT_COUNT > 0 }} && (success() || failure())
with:
name: test-results
Expand Down

0 comments on commit 736cf22

Please sign in to comment.