From eae922481eee0cf54b464449418fc30606a1e3f4 Mon Sep 17 00:00:00 2001 From: Johann Zhang Date: Sat, 28 Jun 2025 13:39:02 -0400 Subject: [PATCH 01/10] added github actions workflow to automate zip file creation --- .github/workflows/create-release-assets.yml | 75 +++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 .github/workflows/create-release-assets.yml diff --git a/.github/workflows/create-release-assets.yml b/.github/workflows/create-release-assets.yml new file mode 100644 index 00000000..380755ad --- /dev/null +++ b/.github/workflows/create-release-assets.yml @@ -0,0 +1,75 @@ +name: Create Release Assets + +on: + push: + branches: + - master + workflow_dispatch: + +jobs: + create-assets: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Create release zip files + run: | + echo "Creating release zip files..." + echo "================================" + + cd datadog-oci-orm/ + + zip -r datadog-oci-orm-metrics-setup.zip ./metrics-setup/* + + zip -r datadog-oci-orm-policy-setup.zip ./policy-setup/* + + zip -r datadog-oci-orm.zip ./* + + mv *.zip ../ + cd ../ + + cd datadog-integration/ + zip -r datadog-integration.zip ./* + mv datadog-integration.zip ../ + cd ../ + + cd datadog-functions/ + zip -r datadog-functions.zip ./* + mv datadog-functions.zip ../ + cd ../ + + - name: Display created files + run: | + ls -la *.zip + echo "" + echo "File sizes:" + echo "==============" + du -h *.zip + + - name: Upload release assets as artifacts + uses: actions/upload-artifact@v4 + with: + name: release-assets + path: | + datadog-oci-orm-metrics-setup.zip + datadog-oci-orm-policy-setup.zip + datadog-oci-orm.zip + datadog-integration.zip + datadog-functions.zip + retention-days: 90 + + - name: Summary + run: | + echo "Release assets have been created and uploaded as artifacts." + echo "" + echo "To use these for a release:" + echo "1. Go to the Actions tab in GitHub" + echo "2. Click on this workflow run" + echo "3. Download the 'release-assets' artifact" + echo "4. Extract the zip files" + echo "5. Upload them manually to your GitHub release" + echo "" + echo "These will be available at URLs like:" + echo "https://github.com/Datadog/oracle-cloud-integration/releases/latest/download/datadog-oci-orm.zip" \ No newline at end of file From 6fb9ca3bcc84f8b7b0908079c0e15944a5280246 Mon Sep 17 00:00:00 2001 From: Johann Zhang Date: Sat, 28 Jun 2025 13:56:42 -0400 Subject: [PATCH 02/10] add permissions and change to commit hashes --- .github/workflows/create-release-assets.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release-assets.yml b/.github/workflows/create-release-assets.yml index 380755ad..97833c76 100644 --- a/.github/workflows/create-release-assets.yml +++ b/.github/workflows/create-release-assets.yml @@ -9,10 +9,13 @@ on: jobs: create-assets: runs-on: ubuntu-latest + permissions: + contents: read + actions: write steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Create release zip files run: | @@ -49,7 +52,7 @@ jobs: du -h *.zip - name: Upload release assets as artifacts - uses: actions/upload-artifact@v4 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 with: name: release-assets path: | From d50a53605709f591e956f6ff0f8fb62d108bda41 Mon Sep 17 00:00:00 2001 From: Johann Zhang Date: Mon, 30 Jun 2025 09:27:42 -0400 Subject: [PATCH 03/10] make organization check and temp change branch for testing --- .github/workflows/create-release-assets.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/workflows/create-release-assets.yml b/.github/workflows/create-release-assets.yml index 97833c76..afbea735 100644 --- a/.github/workflows/create-release-assets.yml +++ b/.github/workflows/create-release-assets.yml @@ -3,6 +3,7 @@ name: Create Release Assets on: push: branches: + - johannzhang8/github-actions-autozip-files - master workflow_dispatch: @@ -14,9 +15,16 @@ jobs: actions: write steps: - - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - + - name: Check organization membership + run: | + if ! gh api /orgs/DataDog/members/${{ github.actor }} > /dev/null 2>&1; then + echo "Unauthorized: Only Datadog organization members can run this workflow" + exit 1 + fi + echo "Verified: ${{ github.actor }} is a Datadog organization member" + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Create release zip files run: | echo "Creating release zip files..." From 5a5460ad1d6fedf80bb94d17d29c60c5358d0198 Mon Sep 17 00:00:00 2001 From: Johann Zhang Date: Mon, 30 Jun 2025 10:49:46 -0400 Subject: [PATCH 04/10] remove the organization membership check just to see if it works --- .github/workflows/create-release-assets.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/create-release-assets.yml b/.github/workflows/create-release-assets.yml index afbea735..cb74bb32 100644 --- a/.github/workflows/create-release-assets.yml +++ b/.github/workflows/create-release-assets.yml @@ -15,15 +15,15 @@ jobs: actions: write steps: - - name: Check organization membership - run: | - if ! gh api /orgs/DataDog/members/${{ github.actor }} > /dev/null 2>&1; then - echo "Unauthorized: Only Datadog organization members can run this workflow" - exit 1 - fi - echo "Verified: ${{ github.actor }} is a Datadog organization member" - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Check organization membership + # run: | + # if ! gh api /orgs/DataDog/members/${{ github.actor }} > /dev/null 2>&1; then + # echo "Unauthorized: Only Datadog organization members can run this workflow" + # exit 1 + # fi + # echo "Verified: ${{ github.actor }} is a Datadog organization member" + # env: + # GITHUB_TOKEN: ${{ secrets.DATADOG_PAT }} - name: Create release zip files run: | From 725929c81a35e49cd52b1899021b7ae2bf7dbdfe Mon Sep 17 00:00:00 2001 From: Johann Zhang Date: Mon, 30 Jun 2025 10:54:30 -0400 Subject: [PATCH 05/10] print directories --- .github/workflows/create-release-assets.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.github/workflows/create-release-assets.yml b/.github/workflows/create-release-assets.yml index cb74bb32..84e585ca 100644 --- a/.github/workflows/create-release-assets.yml +++ b/.github/workflows/create-release-assets.yml @@ -25,6 +25,17 @@ jobs: # env: # GITHUB_TOKEN: ${{ secrets.DATADOG_PAT }} + - name: Checkout repository + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + + - name: Debug - List directory contents + run: | + echo "Current directory: $(pwd)" + echo "Directory contents:" + ls -la + echo "DD directories:" + ls -la | grep -i datadog || echo "No DD directories" + - name: Create release zip files run: | echo "Creating release zip files..." From 95bcee2c7f1e339a3d027763f90b506ed783985a Mon Sep 17 00:00:00 2001 From: Johann Zhang Date: Mon, 30 Jun 2025 11:02:08 -0400 Subject: [PATCH 06/10] actually route to artifact --- .github/workflows/create-release-assets.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/create-release-assets.yml b/.github/workflows/create-release-assets.yml index 84e585ca..7722673c 100644 --- a/.github/workflows/create-release-assets.yml +++ b/.github/workflows/create-release-assets.yml @@ -26,7 +26,7 @@ jobs: # GITHUB_TOKEN: ${{ secrets.DATADOG_PAT }} - name: Checkout repository - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - name: Debug - List directory contents run: | @@ -71,7 +71,7 @@ jobs: du -h *.zip - name: Upload release assets as artifacts - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 + uses: actions/upload-artifact@@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: release-assets path: | From 692eb673feb163b56a1264529d2e4d597bb2fe63 Mon Sep 17 00:00:00 2001 From: Johann Zhang Date: Mon, 30 Jun 2025 11:02:50 -0400 Subject: [PATCH 07/10] typo --- .github/workflows/create-release-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release-assets.yml b/.github/workflows/create-release-assets.yml index 7722673c..0071b871 100644 --- a/.github/workflows/create-release-assets.yml +++ b/.github/workflows/create-release-assets.yml @@ -71,7 +71,7 @@ jobs: du -h *.zip - name: Upload release assets as artifacts - uses: actions/upload-artifact@@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 + uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: release-assets path: | From e58857b31ad13d4eb9bf9fb293c55408714a114d Mon Sep 17 00:00:00 2001 From: Johann Zhang Date: Mon, 30 Jun 2025 12:08:28 -0400 Subject: [PATCH 08/10] removed workflow_dispatch so it just runs when pushed to master --- .github/workflows/create-release-assets.yml | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/.github/workflows/create-release-assets.yml b/.github/workflows/create-release-assets.yml index 0071b871..89f2bf49 100644 --- a/.github/workflows/create-release-assets.yml +++ b/.github/workflows/create-release-assets.yml @@ -3,9 +3,8 @@ name: Create Release Assets on: push: branches: - - johannzhang8/github-actions-autozip-files - master - workflow_dispatch: + - johannzhang8/create-release-assets jobs: create-assets: @@ -15,27 +14,9 @@ jobs: actions: write steps: - # - name: Check organization membership - # run: | - # if ! gh api /orgs/DataDog/members/${{ github.actor }} > /dev/null 2>&1; then - # echo "Unauthorized: Only Datadog organization members can run this workflow" - # exit 1 - # fi - # echo "Verified: ${{ github.actor }} is a Datadog organization member" - # env: - # GITHUB_TOKEN: ${{ secrets.DATADOG_PAT }} - - name: Checkout repository uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 - - name: Debug - List directory contents - run: | - echo "Current directory: $(pwd)" - echo "Directory contents:" - ls -la - echo "DD directories:" - ls -la | grep -i datadog || echo "No DD directories" - - name: Create release zip files run: | echo "Creating release zip files..." From 76e1a3f33c40eccabf80fdab4e3aa5fe2480a4d5 Mon Sep 17 00:00:00 2001 From: Johann Zhang Date: Mon, 30 Jun 2025 12:15:38 -0400 Subject: [PATCH 09/10] more typo --- .github/workflows/create-release-assets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-release-assets.yml b/.github/workflows/create-release-assets.yml index 89f2bf49..a815dd6e 100644 --- a/.github/workflows/create-release-assets.yml +++ b/.github/workflows/create-release-assets.yml @@ -4,7 +4,7 @@ on: push: branches: - master - - johannzhang8/create-release-assets + - johannzhang8/github-actions-autozip-files jobs: create-assets: From ce3fc75989c240963120282d433b408a41aab792 Mon Sep 17 00:00:00 2001 From: Johann Zhang Date: Mon, 30 Jun 2025 12:20:53 -0400 Subject: [PATCH 10/10] remove testing branch --- .github/workflows/create-release-assets.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/create-release-assets.yml b/.github/workflows/create-release-assets.yml index a815dd6e..06f65b2f 100644 --- a/.github/workflows/create-release-assets.yml +++ b/.github/workflows/create-release-assets.yml @@ -4,7 +4,6 @@ on: push: branches: - master - - johannzhang8/github-actions-autozip-files jobs: create-assets: