Unverified Commit 81a4cd2c authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Re-enable linux-musl-x64 build target (#30910)

* Re-enable linux-musl-x64 build target

* copy swc build command

* uncomment needs

* remove strip

* update napi additional
parent 4c3fe080
...@@ -484,8 +484,7 @@ jobs: ...@@ -484,8 +484,7 @@ jobs:
- build-native - build-native
- build-windows-i686 - build-windows-i686
- build-windows-aarch64 - build-windows-aarch64
# Temporarily disabled - build-linux-musl
# - build-linux-musl
- build-linux-arm7 - build-linux-arm7
- build-linux-aarch64 - build-linux-aarch64
- build-android-aarch64 - build-android-aarch64
...@@ -851,60 +850,59 @@ jobs: ...@@ -851,60 +850,59 @@ jobs:
name: next-swc-binaries name: next-swc-binaries
path: packages/next/native/next-swc.win32-arm64-msvc.node path: packages/next/native/next-swc.win32-arm64-msvc.node
# Temporarily disabled build-linux-musl:
# build-linux-musl: needs: build
# needs: build if: ${{ needs.build.outputs.isRelease == 'true' }}
# if: ${{ needs.build.outputs.isRelease == 'true' }} name: next-swc - linux-musl - node@lts
# name: next-swc - linux-musl - node@lts runs-on: ubuntu-latest
# runs-on: ubuntu-latest steps:
# steps: - uses: actions/checkout@v2
# - uses: actions/checkout@v2
- run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change')
# - run: echo ::set-output name=DOCS_CHANGE::$(node skip-docs-change.js echo 'not-docs-only-change') id: docs-change
# id: docs-change
- name: Login to registry
# - name: Login to registry if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
# if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }} run: |
# run: | docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL
# docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REGISTRY_URL env:
# env: DOCKER_REGISTRY_URL: ghcr.io
# DOCKER_REGISTRY_URL: ghcr.io DOCKER_USERNAME: ${{ github.actor }}
# DOCKER_USERNAME: ${{ github.actor }} DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
# DOCKER_PASSWORD: ${{ secrets.GITHUB_TOKEN }}
- name: Cache
# - name: Cache if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
# if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }} uses: actions/cache@v2
# uses: actions/cache@v2 with:
# with: path: |
# path: | target/
# target/ key: linux-musl-publish-integration
# key: linux-musl-publish-integration
- name: Pull docker image
# - name: Pull docker image if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
# if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }} run: |
# run: | docker pull ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
# docker pull ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine docker tag ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine builder
# docker tag ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine builder
- name: Cache native binary
# - name: Cache native binary if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
# if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }} id: binary-cache
# id: binary-cache uses: actions/cache@v2
# uses: actions/cache@v2 with:
# with: path: packages/next/native/next-swc.linux-x64-musl.node
# path: packages/next/native/next-swc.linux-x64-musl.node key: next-swc-nightly-2021-08-12-linux-x64-musl-${{ hashFiles('.github/workflows/build_test_deploy.yml', 'packages/next/build/swc/**') }}
# key: next-swc-nightly-2021-08-12-linux-x64-musl-${{ hashFiles('.github/workflows/build_test_deploy.yml', 'packages/next/build/swc/**') }}
- name: 'Build'
# - name: 'Build' if: ${{ steps.binary-cache.outputs.cache-hit != 'true' && steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
# if: ${{ steps.binary-cache.outputs.cache-hit != 'true' && steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }} run: |
# run: | docker run --rm -v ~/.cargo/git:/root/.cargo/git -v ~/.cargo/registry:/root/.cargo/registry -v $(pwd)/packages/next:/build -w /build builder sh -c "yarn build-native --release --target x86_64-unknown-linux-musl"
# docker run --rm -v $(pwd)/packages/next:/swc -w /swc builder sh -c "yarn build-native --release"
- name: Upload artifact
# - name: Upload artifact if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }}
# if: ${{ steps.docs-change.outputs.DOCS_CHANGE != 'docs only change' }} uses: actions/upload-artifact@v2
# uses: actions/upload-artifact@v2 with:
# with: name: next-swc-binaries
# name: next-swc-binaries path: packages/next/native/next-swc.linux-x64-musl.node
# path: packages/next/native/next-swc.linux-x64-musl.node
build-linux-aarch64: build-linux-aarch64:
needs: build needs: build
......
...@@ -286,7 +286,7 @@ ...@@ -286,7 +286,7 @@
"aarch64-apple-darwin", "aarch64-apple-darwin",
"aarch64-linux-android", "aarch64-linux-android",
"x86_64-unknown-freebsd", "x86_64-unknown-freebsd",
"linux-x64-musl", "x86_64-unknown-linux-musll",
"aarch64-unknown-linux-musl", "aarch64-unknown-linux-musl",
"aarch64-pc-windows-msvc" "aarch64-pc-windows-msvc"
] ]
......
...@@ -20,11 +20,6 @@ const cwd = process.cwd() ...@@ -20,11 +20,6 @@ const cwd = process.cwd()
(name) => !name.startsWith('.') (name) => !name.startsWith('.')
) )
const publishedPkgs = new Set()
// TODO: update to latest version where all packages were
// successfully published
const fallbackVersion = `12.0.1`
for (let platform of platforms) { for (let platform of platforms) {
try { try {
let binaryName = `next-swc.${platform}.node` let binaryName = `next-swc.${platform}.node`
...@@ -48,10 +43,10 @@ const cwd = process.cwd() ...@@ -48,10 +43,10 @@ const cwd = process.cwd()
gitref.includes('canary') ? ' --tag canary' : '' gitref.includes('canary') ? ' --tag canary' : ''
}` }`
) )
publishedPkgs.add(platform)
} catch (err) { } catch (err) {
// don't block publishing other versions on single platform error // don't block publishing other versions on single platform error
console.error(`Failed to publish`, platform, err) console.error(`Failed to publish`, platform)
throw err
} }
// lerna publish in next step will fail if git status is not clean // lerna publish in next step will fail if git status is not clean
execSync( execSync(
...@@ -69,11 +64,7 @@ const cwd = process.cwd() ...@@ -69,11 +64,7 @@ const cwd = process.cwd()
) )
for (let platform of platforms) { for (let platform of platforms) {
let optionalDependencies = nextPkg.optionalDependencies || {} let optionalDependencies = nextPkg.optionalDependencies || {}
optionalDependencies['@next/swc-' + platform] = publishedPkgs.has( optionalDependencies['@next/swc-' + platform] = version
platform
)
? version
: fallbackVersion
nextPkg.optionalDependencies = optionalDependencies nextPkg.optionalDependencies = optionalDependencies
} }
await writeFile( await writeFile(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment