Skip to content

Commit

Permalink
fix release pipeline license issue (#155)
Browse files Browse the repository at this point in the history
* test release pipeline without license

* add test branch

* test with license.txt in parent dir

* make path and artifact name the same to make crt happy

* fix gh var

* keep zip in pkg

* fix name and path

* remove test branch
  • Loading branch information
fairclothjm authored Oct 21, 2024
1 parent a5babb8 commit f21d026
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 13 deletions.
17 changes: 6 additions & 11 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ jobs:
matrix:
goos: [linux]
goarch: ["arm64", "amd64"]

fail-fast: true

name: Go ${{ matrix.goos }} ${{ matrix.goarch }} build
Expand All @@ -69,18 +68,14 @@ jobs:

- name: Build
id: build-binary
env:
GOOS: ${{ matrix.goos }}
GOARCH: ${{ matrix.goarch }}
VERSION: ${{ needs.get-product-version.outputs.product-version }}
run: |
make build
mkdir out
ZIP_FILE="out/${{ env.PKG_NAME }}_${{ needs.get-product-version.outputs.product-version }}_${{ matrix.goos }}_${{ matrix.goarch }}.zip"
zip -r "${ZIP_FILE}" LICENSE pkg/extensions
ZIP_FILE="${{ env.PKG_NAME }}_${{ needs.get-product-version.outputs.product-version }}_${{ matrix.goos }}_${{ matrix.goarch }}.zip"
make zip
mv pkg/${{ env.PKG_NAME }}.zip pkg/"$ZIP_FILE"
echo "path=${ZIP_FILE}" >> $GITHUB_OUTPUT
echo "name=$(basename ${ZIP_FILE})" >> $GITHUB_OUTPUT
echo "name=${ZIP_FILE}" >> "$GITHUB_OUTPUT"
echo "path=pkg/${ZIP_FILE}" >> "$GITHUB_OUTPUT"
- uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0
with:
Expand Down
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ build: clean
.

zip: build
cd pkg && zip -r vault-lambda-extension.zip extensions/
cp LICENSE pkg/LICENSE.txt
cd pkg && zip -r vault-lambda-extension.zip LICENSE.txt extensions/
@echo "Extension built: pkg/vault-lambda-extension.zip"

lint:
Expand Down
2 changes: 1 addition & 1 deletion quick-start/terraform/rds.tf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ resource "aws_db_instance" "main" {
allocated_storage = 20
storage_type = "gp2"
engine = "postgres"
engine_version = "14.7"
engine_version = "14.12"
instance_class = var.db_instance_type
db_name = "lambdadb"
username = "vaultadmin"
Expand Down

0 comments on commit f21d026

Please sign in to comment.