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
43 changes: 26 additions & 17 deletions .github/workflows/ci-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,20 +89,23 @@ jobs:
# In case this is second attempt try restoring failed tests
- name: Restore the previous failed combine result
if: steps.run_result.outputs.run_result == 'failedtest'
uses: martijnhols/actions-cache/restore@v3
uses: actions/download-artifact@v3
with:
path: |
~/combined_failed_spec_ci
key: ${{ github.run_id }}-"ci-test-result"
restore-keys: |
${{ github.run_id }}-${{ github.job }}
name: combined_failed_spec_ci
path: ~/combined_failed_spec_ci

- name: print the file deatils
if: steps.run_result.outputs.run_result == 'failedtest'
run: |
cd ~/combined_failed_spec_ci
ls

# failed_spec_env will contain list of all failed specs
# We are using environment variable instead of regular to support multiline
- name: Get failed_spec
if: steps.run_result.outputs.run_result == 'failedtest'
run: |
failed_spec_env=$(cat ~/combined_failed_spec_ci)
failed_spec_env=$(cat ~/combined_failed_spec_ci/combined_failed_spec_ci)
echo "failed_spec_env<<EOF" >> $GITHUB_ENV
echo "$failed_spec_env" >> $GITHUB_ENV
echo "EOF" >> $GITHUB_ENV
Expand All @@ -116,10 +119,16 @@ jobs:
- name: cat run_result
run: echo ${{ steps.run_result.outputs.run_result }}

# - name: Download Docker image artifact
# uses: actions/download-artifact@v3
# with:
# name: cicontainer

- name: Download Docker image artifact
uses: actions/download-artifact@v3
uses: dawidd6/action-download-artifact@v2
with:
name: cicontainer
run_id: 5053916380

- name: Load Docker image from tar file
run: |
Expand All @@ -132,15 +141,15 @@ jobs:
run: |
mkdir -p cicontainerlocal/stacks/configuration/

#Download the oldstacks from appsmithorg/oldstacks repo
- name: Download the oldstack
uses: actions/checkout@v3
with:
ref: main
repository: appsmithorg/ci-oldstack
token: ${{ secrets.APPSMITH_CI_TEST_PAT }}
submodules: 'recursive'
path: cicontainerlocal/oldstack
# #Download the oldstacks from appsmithorg/oldstacks repo
# - name: Download the oldstack
# uses: actions/checkout@v3
# with:
# ref: main
# repository: appsmithorg/ci-oldstack
# token: ${{ secrets.APPSMITH_CI_TEST_PAT }}
# submodules: 'recursive'
# path: cicontainerlocal/oldstack

- name: Run Appsmith & TED docker image
if: steps.run_result.outputs.run_result != 'success'
Expand Down
58 changes: 29 additions & 29 deletions .github/workflows/test-build-docker-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,41 @@ on:
workflow_dispatch:

jobs:
server-build:
name: server-build
uses: ./.github/workflows/server-build.yml
secrets: inherit
with:
pr: 0
# server-build:
# name: server-build
# uses: ./.github/workflows/server-build.yml
# secrets: inherit
# with:
# pr: 0

client-build:
name: client-build
uses: ./.github/workflows/client-build.yml
secrets: inherit
with:
pr: 0
# client-build:
# name: client-build
# uses: ./.github/workflows/client-build.yml
# secrets: inherit
# with:
# pr: 0

rts-build:
name: rts-build
uses: ./.github/workflows/rts-build.yml
secrets: inherit
with:
pr: 0
# rts-build:
# name: rts-build
# uses: ./.github/workflows/rts-build.yml
# secrets: inherit
# with:
# pr: 0

build-docker-image:
needs: [ client-build, server-build, rts-build ]
# Only run if the build step is successful
if: success()
name: build-docker-image
uses: ./.github/workflows/build-docker-image.yml
secrets: inherit
with:
pr: 0
# build-docker-image:
# needs: [ client-build, server-build, rts-build ]
# # Only run if the build step is successful
# if: success()
# name: build-docker-image
# uses: ./.github/workflows/build-docker-image.yml
# secrets: inherit
# with:
# pr: 0

ci-test:
needs: [ build-docker-image ]
# needs: [ build-docker-image ]
# Only run if the build step is successful
if: success()
# if: success()
name: ci-test
uses: ./.github/workflows/ci-test.yml
secrets: inherit
Expand Down