Skip to content

Commit 70165e5

Browse files
committed
fix branch names, clean up test workflow
1 parent 70992f6 commit 70165e5

2 files changed

Lines changed: 21 additions & 23 deletions

File tree

.github/workflows/deploy.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#
33
# act pull_request [--input command=[command]] \
44
# --platform fusionauth-builder=[ecr-repo-name]/fusionauth-builder:latest] \
5-
# --workflows ./.github/workflows/release.yaml \
5+
# --workflows ./.github/workflows/deploy.yaml \
66
# --env-file <(aws configure export-credentials --profile [aws-profile] --format env)
77

88
name: Deploy

.github/workflows/test.yaml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,43 @@
1-
name: run_tests
1+
# Run locally with act:
2+
#
3+
# act pull_request \
4+
# --platform fusionauth-builder=752443094709.dkr.ecr.us-west-2.amazonaws.com/gha-runner-fusionauth-builder:latest \
5+
# --workflows ./.github/workflows/test.yaml
26

7+
name: Test
38

4-
# Controls when the action will run.
59
on:
610
push:
7-
branches: [ "master" ]
11+
branches:
12+
- main
813
pull_request:
9-
branches: [ "master" ]
14+
branches:
15+
- main
1016
workflow_dispatch:
1117

12-
# A workflow run is made up of one or more jobs that can run sequentially or in parallel
1318
jobs:
14-
# This workflow contains a single job called "run_tests"
1519
run_tests:
16-
# The type of runner that the job will run on
17-
runs-on: ubuntu-latest
20+
runs-on: fusionauth-builder
1821
env:
1922
FUSIONAUTH_URL: http://localhost:9011
2023
FUSIONAUTH_API_KEY: bf69486b-4733-4470-a592-f1bfce7af580
21-
22-
# Steps represent a sequence of tasks that will be executed as part of the job
2324
steps:
24-
# Setup the system with the repository code, Java, and Ruby
2525
- uses: actions/checkout@v4
26-
- uses: isbang/compose-action@v1.5.1
27-
with:
28-
compose-file: './src/test/docker/docker-compose.yml'
29-
down-flags: '--volumes'
30-
- uses: actions/setup-python@v5
31-
with:
32-
python-version: '3.12.2'
26+
27+
- name: Set up FusionAuth
28+
working-directory: src/test/docker
29+
run: docker compose up -d
30+
3331
- name: Install fusionauth library
32+
shell: bash -l {0}
3433
run: pip3 install .
35-
shell: bash
34+
3635
- name: Check to see if FusionAuth is loaded
3736
run: |
3837
bash ./src/test/docker/poll-for-kickstart-finish.sh
39-
shell: bash
40-
# Run the tests
38+
4139
- name: Run tests
40+
shell: bash -l {0}
4241
run: |
4342
python3 src/test/python/fusionauth/rest_client_test.py
4443
python3 src/test/python/fusionauth/fusionauth_client_test.py
45-
shell: bash

0 commit comments

Comments
 (0)