From 152775430566dcb6b9387fe3bb1894f9bc3b1f95 Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Thu, 9 May 2024 10:35:14 -0700 Subject: [PATCH 1/8] added main branch to test --- .github/workflows/release.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f0b7f9..20f225a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,7 +7,7 @@ on: description: "Version to use for the release." required: true default: "X.Y" - # developmentVersion: #this could be the release notes?? + # developmentVersion: #this could be the release body? # description: "Version to use for further development" # required: true # default: "X.Y.Z-RIE" @@ -17,8 +17,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - # with: - # ref: 'main' + with: + ref: 'main' - name: Set up python uses: actions/setup-python@v5 with: @@ -31,7 +31,9 @@ jobs: - name: Release uses: softprops/action-gh-release@v2 with: + name: Release ${{ github.event.inputs.releaseVersion }} tag_name: v${{ github.event.inputs.releaseVersion }} + body: This is the body files: | bin/aws-lambda-rie bin/aws-lambda-rie-arm64 From c88ed22e853ba1c2b2b81dd66a87633be8d8e393 Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Thu, 9 May 2024 10:51:32 -0700 Subject: [PATCH 2/8] Add release body --- .github/workflows/release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 20f225a..48874f2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -7,10 +7,10 @@ on: description: "Version to use for the release." required: true default: "X.Y" - # developmentVersion: #this could be the release body? - # description: "Version to use for further development" - # required: true - # default: "X.Y.Z-RIE" + releaseBody: + description: "Information about the release" + required: true + default: "New release" jobs: Release: environment: Release @@ -33,7 +33,7 @@ jobs: with: name: Release ${{ github.event.inputs.releaseVersion }} tag_name: v${{ github.event.inputs.releaseVersion }} - body: This is the body + body: ${{ github.event.inputs.releaseBody }} files: | bin/aws-lambda-rie bin/aws-lambda-rie-arm64 From 2eb4faefb473f3f288aa6bd3c53c00d72843ce2d Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Thu, 9 May 2024 11:33:32 -0700 Subject: [PATCH 3/8] added tests inside --- .github/workflows/release.yml | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 48874f2..03d9cfe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,9 +25,23 @@ jobs: python-version: '3.11' - name: Build run: make compile-with-docker-all - - name: Run Tests - run: | # have to set up python? - make tests-with-docker + - name: Run Integ Tests + run: make tests-with-docker + - name: Run Integ Tests x86 + uses: actions/setup-python@v5 + with: + python-version: '3.11' + run: make integ-tests-with-docker-x86-64 + - name: Run Integ Tests arm64 + uses: actions/setup-python@v5 + with: + python-version: '3.11' + run: make integ-tests-with-docker-arm64 + - name: Run Integ Tests Old + uses: actions/setup-python@v5 + with: + python-version: '3.11' + run: make integ-tests-with-docker-old - name: Release uses: softprops/action-gh-release@v2 with: From 8b4f0a7edbb28274daecbbd5beb56b3abf7110f7 Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Thu, 9 May 2024 11:37:15 -0700 Subject: [PATCH 4/8] collapse tests --- .github/workflows/release.yml | 36 +++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 03d9cfe..f98fc20 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,22 +26,26 @@ jobs: - name: Build run: make compile-with-docker-all - name: Run Integ Tests - run: make tests-with-docker - - name: Run Integ Tests x86 - uses: actions/setup-python@v5 - with: - python-version: '3.11' - run: make integ-tests-with-docker-x86-64 - - name: Run Integ Tests arm64 - uses: actions/setup-python@v5 - with: - python-version: '3.11' - run: make integ-tests-with-docker-arm64 - - name: Run Integ Tests Old - uses: actions/setup-python@v5 - with: - python-version: '3.11' - run: make integ-tests-with-docker-old + run: | + make tests-with-docker + make integ-tests-with-docker-x86-64 + make integ-tests-with-docker-arm64 + make integ-tests-with-docker-old + # - name: Run Integ Tests x86 + # uses: actions/setup-python@v5 + # with: + # python-version: '3.11' + # run: make integ-tests-with-docker-x86-64 + # - name: Run Integ Tests arm64 + # uses: actions/setup-python@v5 + # with: + # python-version: '3.11' + # run: make integ-tests-with-docker-arm64 + # - name: Run Integ Tests Old + # uses: actions/setup-python@v5 + # with: + # python-version: '3.11' + # run: make integ-tests-with-docker-old - name: Release uses: softprops/action-gh-release@v2 with: From a57dc9553076bbff3e81926ce5eec58975a0d1b1 Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Thu, 9 May 2024 11:53:14 -0700 Subject: [PATCH 5/8] main branch bug? --- .github/workflows/release.yml | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f98fc20..363b21e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: required: true default: "X.Y" releaseBody: - description: "Information about the release" + description: "Information about the release" #not showing if main branch? and using old version of this file if on main branch???? required: true default: "New release" jobs: @@ -17,8 +17,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - with: - ref: 'main' + # with: + # ref: 'main' - name: Set up python uses: actions/setup-python@v5 with: @@ -31,21 +31,6 @@ jobs: make integ-tests-with-docker-x86-64 make integ-tests-with-docker-arm64 make integ-tests-with-docker-old - # - name: Run Integ Tests x86 - # uses: actions/setup-python@v5 - # with: - # python-version: '3.11' - # run: make integ-tests-with-docker-x86-64 - # - name: Run Integ Tests arm64 - # uses: actions/setup-python@v5 - # with: - # python-version: '3.11' - # run: make integ-tests-with-docker-arm64 - # - name: Run Integ Tests Old - # uses: actions/setup-python@v5 - # with: - # python-version: '3.11' - # run: make integ-tests-with-docker-old - name: Release uses: softprops/action-gh-release@v2 with: From 3c1e8aebb84db84f50b78b73863726d5c2c0cd47 Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Thu, 9 May 2024 12:02:32 -0700 Subject: [PATCH 6/8] Should work on main if the newer file is in main lol --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 363b21e..365e2d3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: required: true default: "X.Y" releaseBody: - description: "Information about the release" #not showing if main branch? and using old version of this file if on main branch???? + description: "Information about the release" required: true default: "New release" jobs: @@ -17,8 +17,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - # with: - # ref: 'main' - name: Set up python uses: actions/setup-python@v5 with: From 74a76a1c49ef172130bde4a57c59283484dc4b79 Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Thu, 9 May 2024 12:16:32 -0700 Subject: [PATCH 7/8] checkout main again --- .github/workflows/release.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 365e2d3..5d94f91 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,6 +17,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + with: + ref: main - name: Set up python uses: actions/setup-python@v5 with: From fb471300b8ba402826ee9fe395ef6e40d23533ad Mon Sep 17 00:00:00 2001 From: Seshu Brahma Date: Tue, 14 May 2024 11:41:07 -0700 Subject: [PATCH 8/8] Fixed integ tests section --- .github/workflows/release.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5d94f91..32e878d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -28,9 +28,7 @@ jobs: - name: Run Integ Tests run: | make tests-with-docker - make integ-tests-with-docker-x86-64 - make integ-tests-with-docker-arm64 - make integ-tests-with-docker-old + make integ-tests - name: Release uses: softprops/action-gh-release@v2 with: