phoenix/soaricarus_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

ci: Updating workflows
pr CI / Test Suite (pull_request) Successful in 2m36s
Details

Browse Source
This commit is contained in:
phoenix
2026-08-08 14:26:11 -04:00
parent 4257e4b7bc
commit c5578da54e
2 changed files with 32 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/pr.yml
+7 -9
View File
@@ -50,6 +50,7 @@ jobs:
AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
AWS_DEFAULT_REGION: us-east-1
ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL}}"
run: |
sudo apt update
echo "Installing curl and unzip"
@@ -68,7 +69,7 @@ jobs:
echo "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
echo "Creating bucket: $BUCKET"
aws --endpoint-url=${{ secrets.S3_CI_ENDPOINT_URL }} s3 mb s3://$BUCKET --region $AWS_DEFAULT_REGION
aws --endpoint-url=$ENDPOINT_URL s3 mb s3://$BUCKET --region $AWS_DEFAULT_REGION
- name: Run tests
env:
@@ -79,10 +80,10 @@ jobs:
ROOT_DIRECTORY: "/tmp"
AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
AWS_DEFAULT_REGION: us-east-1
AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
GARAGE_DEFAULT_ACCESS_KEY: "${{ secrets.GARAGE_KEY_ID }}"
GARAGE_DEFAULT_SECRET_KEY: "${{ secrets.GARAGE_SECRET }}"
GARAGE_S3_REGION: us-east-1
GARAGE_S3_REGION: "${{ env.AWS_DEFAULT_REGION }}"
S3_BUCKET_NAME: ${{ env.S3_BUCKET }}
S3_ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL }}"
AWS_S3_FORCE_PATH_STYLE: "true"
@@ -95,17 +96,14 @@ jobs:
eval $(ssh-agent -s)
ssh-add -v ~/.ssh/soaricarus_models_deploy_key
echo "Bucket: $S3_BUCKET"
echo "S3 Bucket: $S3_BUCKET_NAME"
cargo test
- name: Cleanup
if: always()
run: |
echo "Cleaning up bucket ${{ env.S3_BUCKET }}"
echo "Region: ${{ env.AWS_DEFAULT_REGION }}"
echo "B: $BUCK"
echo "Cleaning up bucket $BUCK"
echo "Region: $AWS_DEFAULT_REGION"
aws --endpoint-url=$ENDPOINT_URL \
s3 rb s3://$BUCK --force \
--region $AWS_DEFAULT_REGION
.github/workflows/workflow.yml
+25 -15
View File
@@ -67,27 +67,32 @@ jobs:
- name: Setup S3
env:
GARAGE_DEFAULT_ACCESS_KEY: "${{ secrets.GARAGE_KEY_ID }}"
GARAGE_DEFAULT_SECRET_KEY: "${{ secrets.GARAGE_SECRET }}"
GARAGE_DEFAULT_BUCKET: "soaricarus-ci-bucket"
AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
AWS_DEFAULT_REGION: us-east-1
ENDPOINT_URL: "${{ secrets.S3_CI_ENDPOINT_URL}}"
run: |
sudo apt update
echo "Installing curl and unzip"
sudo apt install curl unzip -y
echo "Installing awscli"
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
unzip awscliv2.zip
sudo ./aws/install
aws --version
# curl -v ${{ secrets.S3_CI_ENDPOINT_URL }}
# Create bucket
aws --endpoint-url=${{ secrets.S3_CI_ENDPOINT_URL }} s3 mb s3://soaricarus-ci-bucket --region us-east-1
BUCKET="soaricarus-ci-bucket-$(echo $RANDOM | md5sum | head -c 8)"
echo "S3_BUCKET=$BUCKET" >> $GITHUB_ENV
echo "AWS_DEFAULT_REGION=$AWS_DEFAULT_REGION" >> $GITHUB_ENV
echo "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" >> $GITHUB_ENV
echo "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" >> $GITHUB_ENV
echo "Creating bucket: $BUCKET"
aws --endpoint-url=$ENDPOINT_URL s3 mb s3://$BUCKET --region $AWS_DEFAULT_REGION
- name: Run tests
env:
# Define DATABASE_URL for tests to use
DATABASE_URL: postgresql://${{ secrets.DB_TEST_USER || 'testuser' }}:${{ secrets.DB_TEST_PASSWORD || 'testpassword' }}@postgres:5432/${{ secrets.DB_TEST_NAME || 'testdb' }}
RUST_LOG: info # Optional: configure test log level
SECRET_MAIN_KEY: ${{ secrets.TOKEN_SECRET_KEY }}
@@ -95,10 +100,10 @@ jobs:
ROOT_DIRECTORY: "/tmp"
AWS_ACCESS_KEY_ID: ${{ secrets.GARAGE_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.GARAGE_SECRET }}
AWS_DEFAULT_REGION: us-east-1
AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
GARAGE_DEFAULT_ACCESS_KEY: ${{ secrets.GARAGE_KEY_ID }}
GARAGE_DEFAULT_SECRET_KEY: ${{ secrets.GARAGE_SECRET }}
GARAGE_S3_REGION: us-east-1
GARAGE_S3_REGION: "${{ env.AWS_DEFAULT_REGION }}"
S3_BUCKET_NAME: "soaricarus-ci-bucket"
S3_ENDPOINT_URL: "http://localhost:3900"
AWS_S3_FORCE_PATH_STYLE: "true"
@@ -116,13 +121,18 @@ jobs:
- name: Cleanup
if: always()
run: |
aws --endpoint-url=${{ secrets.S3_CI_ENDPOINT_URL }} \
s3 rb s3://soaricarus-ci-bucket --force \
--region us-east-1
echo "Cleaning up bucket $BUCK"
echo "Region: $AWS_DEFAULT_REGION"
aws --endpoint-url=$ENDPOINT_URL \
s3 rb s3://$BUCK --force \
--region $AWS_DEFAULT_REGION
env:
AWS_ACCESS_KEY_ID: "${{ secrets.GARAGE_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ secrets.GARAGE_SECRET }}"
AWS_DEFAULT_REGION: us-east-1
ENDPOINT_URL: ${{ secrets.S3_CI_ENDPOINT_URL }}
AWS_ACCESS_KEY_ID: "${{ env.AWS_ACCESS_KEY_ID }}"
AWS_SECRET_ACCESS_KEY: "${{ env.AWS_SECRET_ACCESS_KEY }}"
AWS_DEFAULT_REGION: "${{ env.AWS_DEFAULT_REGION }}"
BUCK: ${{ env.S3_BUCKET }}
continue-on-error: true
fmt: