From bd4a2ebbb5b67a18125fdc607f221543745a8569 Mon Sep 17 00:00:00 2001 From: Evan Parker Date: Fri, 1 Aug 2025 16:54:50 +0000 Subject: [PATCH 1/3] update lfs pusher --- .github/workflows/push-to-s3.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-to-s3.yaml b/.github/workflows/push-to-s3.yaml index 87fe2b6..384ce3d 100644 --- a/.github/workflows/push-to-s3.yaml +++ b/.github/workflows/push-to-s3.yaml @@ -6,9 +6,13 @@ on: push: branches: - develop + pull_request: + branches: + - develop schedule: # 1:30 AM on the 1st and 15th day of each month. - cron: 30 1 1,15 * * + workflow_dispatch: {} jobs: upload: @@ -33,9 +37,8 @@ jobs: - name: Create tarball and upload to s3 env: - LFS_BUCKET_AND_PATH: jcsda-usaf-ci-build-cache/lfs + LFS_BUCKET_AND_PATH: jcsda-public-rpays/JCSDA-internal run: | - set -e export repository_name=$(basename $(pwd)) echo "Prep repo ${repository_name} for upload" git fetch --all From 39a92613d8db33cef55c2df6b6f9a9d72cf09c56 Mon Sep 17 00:00:00 2001 From: Evan Parker Date: Fri, 1 Aug 2025 18:15:08 +0000 Subject: [PATCH 2/3] remove pull-request run trigger used for testing --- .github/workflows/push-to-s3.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/push-to-s3.yaml b/.github/workflows/push-to-s3.yaml index 384ce3d..471dfc0 100644 --- a/.github/workflows/push-to-s3.yaml +++ b/.github/workflows/push-to-s3.yaml @@ -6,9 +6,6 @@ on: push: branches: - develop - pull_request: - branches: - - develop schedule: # 1:30 AM on the 1st and 15th day of each month. - cron: 30 1 1,15 * * From 7bd05679c0bb459fb2d21e3878e1a0907900090e Mon Sep 17 00:00:00 2001 From: Evan Parker Date: Fri, 1 Aug 2025 18:28:51 +0000 Subject: [PATCH 3/3] detect org name for upload path --- .github/workflows/push-to-s3.yaml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-to-s3.yaml b/.github/workflows/push-to-s3.yaml index 471dfc0..99a0872 100644 --- a/.github/workflows/push-to-s3.yaml +++ b/.github/workflows/push-to-s3.yaml @@ -34,10 +34,14 @@ jobs: - name: Create tarball and upload to s3 env: - LFS_BUCKET_AND_PATH: jcsda-public-rpays/JCSDA-internal + LFS_BUCKET: jcsda-public-rpays run: | export repository_name=$(basename $(pwd)) - echo "Prep repo ${repository_name} for upload" + export org_name="${GITHUB_REPOSITORY_OWNER}" + export LFS_BUCKET_AND_PATH="${LFS_BUCKET}/${org_name}" + echo "Detected organization: ${org_name}" + echo "Uploading repository to s3://${LFS_BUCKET_AND_PATH}/${repository_name}.tar.gz" + echo "Preparing ${repository_name} for upload" git fetch --all git checkout develop git config --local --remove-section 'http.https://github.com/'