diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 28a84048c0..cd45bd6d98 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -80,7 +80,7 @@ jobs: - name: Set `make` command for lighthouse if: startsWith(matrix.binary, 'lighthouse') run: | - echo "MAKE_CMD=build-${{ matrix.cpu_arch }}-portable" >> $GITHUB_ENV + echo "MAKE_CMD=build-${{ matrix.cpu_arch }}" >> $GITHUB_ENV - name: Set `make` command for lcli if: startsWith(matrix.binary, 'lcli') diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 76925a8be0..f1ec2e4655 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -78,13 +78,13 @@ jobs: if: matrix.arch == 'aarch64-unknown-linux-gnu' run: | cargo install cross - env CROSS_PROFILE=${{ matrix.profile }} make build-aarch64-portable + env CROSS_PROFILE=${{ matrix.profile }} make build-aarch64 - name: Build Lighthouse for x86_64-unknown-linux-gnu if: matrix.arch == 'x86_64-unknown-linux-gnu' run: | cargo install cross - env CROSS_PROFILE=${{ matrix.profile }} make build-x86_64-portable + env CROSS_PROFILE=${{ matrix.profile }} make build-x86_64 - name: Move cross-compiled binary if: contains(matrix.arch, 'unknown-linux-gnu') @@ -113,7 +113,7 @@ jobs: echo "$GPG_PASSPHRASE" | gpg --passphrase-fd 0 --pinentry-mode loopback --batch -ab lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz for ext in "tar.gz" "tar.gz.asc";\ do for f in *.$ext;\ - do cp $f "../${f%.$ext}-portable.$ext";\ + do cp $f "../${f%.$ext}.$ext";\ done;\ done mv *tar.gz* .. @@ -144,14 +144,6 @@ jobs: path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz compression-level: 0 - - name: Upload artifact (copy) - if: startsWith(matrix.arch, 'x86_64-windows') != true - uses: actions/upload-artifact@v4 - with: - name: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz - path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz - compression-level: 0 - - name: Upload signature uses: actions/upload-artifact@v4 with: @@ -159,14 +151,6 @@ jobs: path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}.tar.gz.asc compression-level: 0 - - name: Upload signature (copy) - if: startsWith(matrix.arch, 'x86_64-windows') != true - uses: actions/upload-artifact@v4 - with: - name: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz.asc - path: lighthouse-${{ needs.extract-version.outputs.VERSION }}-${{ matrix.arch }}-portable.tar.gz.asc - compression-level: 0 - draft-release: name: Draft Release needs: [build, extract-version] diff --git a/Makefile b/Makefile index 975a1cd316..d94c2df261 100644 --- a/Makefile +++ b/Makefile @@ -60,8 +60,6 @@ install-lcli: # - The current user is in the `docker` group. # # The resulting binaries will be created in the `target/` directory. -# -# The *-portable options is the default feature. build-x86_64: cross build --bin lighthouse --target x86_64-unknown-linux-gnu --features "portable,$(CROSS_FEATURES)" --profile "$(CROSS_PROFILE)" --locked build-aarch64: