From bffda5dcb3d0e835b1e1f813423602213bff2d97 Mon Sep 17 00:00:00 2001 From: Mateusz Faderewski Date: Sat, 11 Feb 2023 11:17:55 +0100 Subject: [PATCH] [SC64][FW] Included default Lattice Diamond license --- .github/workflows/build.yml | 16 +++------------- .gitignore | 1 - docker_build.sh | 2 +- fw/project/lcmxo2/license.dat | 24 ++++++++++++++++++++++++ 4 files changed, 28 insertions(+), 15 deletions(-) create mode 100644 fw/project/lcmxo2/license.dat diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6048ed1..31af60c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,12 +4,12 @@ on: push: branches: - main + pull_request: + branches: + - main release: types: - created - workflow_run: - workflows: - - pull-request workflow_dispatch: jobs: @@ -21,17 +21,7 @@ jobs: with: submodules: true - - name: Prepare Lattice Diamond license - env: - ENCODED_LICENSE: ${{ secrets.LATTICE_DIAMOND_LICENSE }} - run: | - mkdir -p ./flexlm - echo "$ENCODED_LICENSE" > ./flexlm/encoded_license - base64 -d ./flexlm/encoded_license > ./flexlm/license.dat - - name: Build script - env: - MAC_ADDRESS: ${{ secrets.LATTICE_DIAMOND_MAC }} run: ./docker_build.sh release --force-clean - name: Upload artifact diff --git a/.gitignore b/.gitignore index 44266f1..68a54dd 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,5 @@ **/.vscode/ **/*.bak **/*.zip -/flexlm !**/.vscode/tasks.json diff --git a/docker_build.sh b/docker_build.sh index ab2d8fb..a8b4a2a 100755 --- a/docker_build.sh +++ b/docker_build.sh @@ -20,7 +20,7 @@ docker run \ --rm \ --user $(id -u):$(id -g) \ --mac-address ${MAC_ADDRESS:-F8:12:34:56:78:90} \ - --mount type=bind,src="$(pwd)/flexlm",target="/flexlm" \ + --mount type=bind,src="$(pwd)/fw/project/lcmxo2/license.dat",target="/flexlm/license.dat" \ --mount type=bind,src="$(pwd)",target="/workdir" \ -h=`hostname` \ -e GIT_BRANCH="$GIT_BRANCH" \ diff --git a/fw/project/lcmxo2/license.dat b/fw/project/lcmxo2/license.dat new file mode 100644 index 0000000..54d5f13 --- /dev/null +++ b/fw/project/lcmxo2/license.dat @@ -0,0 +1,24 @@ +FEATURE LSC_BASE lattice 8.0 11-feb-2024 uncounted 1303CFE67866 \ + VENDOR_STRING="ispLEVER BASE" HOSTID=f81234567890 +FEATURE LSC_SYNPLIFY lattice 8.0 11-feb-2024 uncounted B52A4FF71CC8 \ + VENDOR_STRING="ispLEVER System with Synplicity" \ + HOSTID=f81234567890 +FEATURE LSC_SYNPLIFYPRO1 lattice 10.0 11-feb-2024 uncounted \ + 30EA214E8213 VENDOR_STRING="ispLEVER System with Synplicity \ + Pro 1" HOSTID=f81234567890 +FEATURE LSC_ADVANCED_DSP lattice 10.0 11-feb-2024 uncounted \ + 1BFB494C1D0D VENDOR_STRING="ispLEVER DSP" HOSTID=f81234567890 +FEATURE LSC_DIAMOND_A lattice 10.0 11-feb-2024 uncounted 1067C09C10BA \ + VENDOR_STRING="Diamond Free" HOSTID=f81234567890 +FEATURE LSC_PROGRAMMER_MATURE lattice 10.0 11-feb-2024 uncounted \ + 4559F34D65AB VENDOR_STRING=Programmer HOSTID=f81234567890 +FEATURE LSC_ADVANCED_ORCA lattice 9.0 11-feb-2024 uncounted \ + CC7BBC2A3A16 VENDOR_STRING="ispORCA System" \ + HOSTID=f81234567890 + +INCREMENT latticemsim mgcld 2023.09 11-feb-2024 0 6FE612FBCA60340B3076 \ + VENDOR_STRING=672C91AB HOSTID=f81234567890 ISSUER="ModelSIM Lattice" \ + SN=284862648 SIGN2="1E93 D015 CA8E 6012 81DA 3394 F0EA 3C2F 5482 24AB \ + F903 2C13 A952 2697 2AF4 0819 2FA9 8CE8 CC9B 329B F71E C11F C29E A733 \ + 3D18 B2C3 7983 70EA 2885 F23E" +