Skip to content

Commit 7f05e31

Browse files
MajoBergermilanmajchrak
authored andcommitted
Internal/rework actions (#523)
* no longer needed gh action * deploy after images not working * five is five! * corrected indent * removed unused action * is it plane? is it duck? is it string? * same repo needs other syntax? * run, not runs * this if is wrong * just inputs, not github.event.inputs * correct inputs to gh actions * full build and fixed deploy.yml * last polish * final v2
1 parent 4a1cc3a commit 7f05e31

4 files changed

Lines changed: 35 additions & 46 deletions

File tree

.github/workflows/build.yml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -188,31 +188,31 @@ jobs:
188188
- name: Shutdown Docker containers
189189
run: docker-compose -f ./docker/docker-compose-ci.yml down
190190

191-
# Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
192-
# job above. This is necessary because Codecov uploads seem to randomly fail at times.
193-
# See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
194-
codecov:
195-
# Must run after 'tests' job above
196-
needs: tests
197-
runs-on: ubuntu-latest
198-
steps:
199-
- name: Checkout
200-
uses: actions/checkout@v3
201-
202-
# Download artifacts from previous 'tests' job
203-
- name: Download coverage artifacts
204-
uses: actions/download-artifact@v3
205-
206-
# Now attempt upload to Codecov using its action.
207-
# NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
208-
#
209-
# Retry action: https://github.com/marketplace/actions/retry-action
210-
# Codecov action: https://github.com/codecov/codecov-action
211-
- name: Upload coverage to Codecov.io
212-
uses: Wandalen/wretry.action@v1.0.36
213-
with:
214-
action: codecov/codecov-action@v3
215-
# Try upload 5 times max
216-
attempt_limit: 5
217-
# Run again in 30 seconds
218-
attempt_delay: 30000
191+
# # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test
192+
# # job above. This is necessary because Codecov uploads seem to randomly fail at times.
193+
# # See https://community.codecov.com/t/upload-issues-unable-to-locate-build-via-github-actions-api/3954
194+
# codecov:
195+
# # Must run after 'tests' job above
196+
# needs: tests
197+
# runs-on: ubuntu-latest
198+
# steps:
199+
# - name: Checkout
200+
# uses: actions/checkout@v3
201+
#
202+
# # Download artifacts from previous 'tests' job
203+
# - name: Download coverage artifacts
204+
# uses: actions/download-artifact@v3
205+
#
206+
# # Now attempt upload to Codecov using its action.
207+
# # NOTE: We use a retry action to retry the Codecov upload if it fails the first time.
208+
# #
209+
# # Retry action: https://github.com/marketplace/actions/retry-action
210+
# # Codecov action: https://github.com/codecov/codecov-action
211+
# - name: Upload coverage to Codecov.io
212+
# uses: Wandalen/wretry.action@v1.0.36
213+
# with:
214+
# action: codecov/codecov-action@v3
215+
# # Try upload 5 times max
216+
# attempt_limit: 5
217+
# # Run again in 30 seconds
218+
# attempt_delay: 30000

.github/workflows/deploy.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ on:
2929
type: boolean
3030

3131
jobs:
32-
deploy:
33-
if: github.event.inputs.INSTANCE == '*' || github.event.inputs.INSTANCE == '5'
32+
deploy-5:
33+
if: inputs.INSTANCE == '*' || inputs.INSTANCE == '5'
3434
runs-on: dspace-dep-1
3535
timeout-minutes: 5
3636
env:
@@ -45,7 +45,7 @@ jobs:
4545
./start.sh dspace-$INSTANCE
4646
4747
deploy-8:
48-
if: github.event.inputs.INSTANCE == '*' || github.event.inputs.INSTANCE == '8'
48+
if: inputs.INSTANCE == '*' || inputs.INSTANCE == '8'
4949
runs-on: dspace-dep-1
5050
timeout-minutes: 120
5151
env:
@@ -72,7 +72,7 @@ jobs:
7272
7373
import-8:
7474
runs-on: dspace-dep-1
75-
if: github.event.inputs.IMPORT == 'true'
75+
if: inputs.IMPORT == 'true' # shouldn't there also be if instance = 5?
7676
needs: deploy-8
7777
env:
7878
INSTANCE: '8'

.github/workflows/docker.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,4 +141,7 @@ jobs:
141141
deploy:
142142
needs: docker
143143
uses: dataquest-dev/dspace-angular/.github/workflows/deploy.yml@dtq-dev
144+
with:
145+
INSTANCE: '5'
146+
IMPORT: false
144147
secrets: inherit

.github/workflows/reindex.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)