Skip to content

Commit

Permalink
Some small fixes attempt
Browse files Browse the repository at this point in the history
  • Loading branch information
fmacleal committed Jun 27, 2024
1 parent e6e970f commit 638a1be
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 24 deletions.
28 changes: 5 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,22 +8,14 @@ on:

permissions:
contents: read
packages: write

jobs:
test-rit-docker:
build-push-rit-action-image:
name: Test RIT Action docker image
runs-on: ubuntu-latest
timeout-minutes: 60

services:
registry:
image: registry:2
ports:
- 5001:5000

env:
TEST_TAG: localhost:5001/actions/container-action:latest

steps:
- name: Checkout
id: checkout
Expand All @@ -33,7 +25,7 @@ jobs:
id: meta
uses: docker/metadata-action@v5
with:
images: ${{ env.GHCR_REPO }}
images: ${{ github.event.repository.name }}/rit-action

- name: Setup Docker BuildX
id: setup-buildx
Expand All @@ -55,22 +47,12 @@ jobs:
uses: docker/build-push-action@v6
with:
context: .github/images
push: ${{ github.event_name != 'pull_request' }}
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

- name: Run the RIT Container Action
id: run
env:
RSKJ_BRANCH: 'master'
FEDERATOR_BRANCH: 'master'
run: |
docker run \
--env RSKJ_BRANCH="${{ env.RSKJ_BRANCH }}" \
--env FEDERATOR_BRANCH="${{ env.FEDERATOR_BRANCH }}" \
--rm ${{ env.TEST_TAG }}
test-rit-action:
needs: build-push-rit-action-image
name: GitHub Actions Test
runs-on: ubuntu-latest
timeout-minutes: 60
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,5 @@ config/*.js
logs
.env
.DS_Store
.idea/
.idea/
.secrets

0 comments on commit 638a1be

Please sign in to comment.