Skip to content

Commit

Permalink
Clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
deluan committed Oct 10, 2024
1 parent 3c43c32 commit 66b79b0
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 24 deletions.
28 changes: 5 additions & 23 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ jobs:
build:
strategy:
matrix:
# platform: [ linux/amd64, linux/arm64 ]
platform: [ linux/amd64, linux/arm64, linux/arm/v5, linux/arm/v6, linux/arm/v7, linux/386, darwin/amd64, darwin/arm64, windows/amd64, windows/386 ]
runs-on: ubuntu-latest
steps:
Expand All @@ -28,39 +27,22 @@ jobs:

- uses: actions/checkout@v4

# - name: Login to GitHub Container Registry
# uses: docker/login-action@v3
# with:
# registry: ghcr.io
# username: ${{ github.actor }}
# password: ${{ secrets.GITHUB_TOKEN }}

# - name: Extract metadata for Docker
# id: meta
# uses: docker/metadata-action@v5
# with:
# labels: |
# maintainer=deluan
# images: |
# name=ghcr.io/${{ github.repository }}
# tags: |
# type=semver,pattern={{version}}
- name: Load version
id: version
run: cat .versions >> $GITHUB_ENV

- name: Build
uses: docker/build-push-action@v5
with:
context: .
file: Dockerfile
platforms: ${{ matrix.platform }}
# push: true
outputs: |
type=local,dest=./output
target: artifact
# tags: ${{ steps.meta.outputs.tags }}
build-args: |
TAGLIB_VERSION=2.0.2
TAGLIB_SHA=e3de03501ff66221d1f1f971022b248d5b38ba06
RELEASE_VERSION=0
TAGLIB_VERSION=${{ env.TAGLIB_VERSION }}
TAGLIB_SHA=${{ env.TAGLIB_SHA }}
- name: Sanitize platform name
id: set-platform
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ARG TARGETPLATFORM
RUN xx-apt install -y binutils gcc g++ libc6-dev zlib1g-dev

# Build TagLib for the target platform
ENV TABLIB_BUILD_OPTS="-DCMAKE_BUILD_TYPE=Release -DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF"
ENV TAGLIB_BUILD_OPTS="-DCMAKE_BUILD_TYPE=Release -DWITH_MP4=ON -DWITH_ASF=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_TESTING=OFF"
RUN --mount=from=osxcross,target=/osxcross,src=/osxcross,ro \
echo "Build static TagLib $TAGLIB_VERSION for $TARGETPLATFORM" && \
ln -s /osxcross/SDK /xx-sdk && \
Expand Down

0 comments on commit 66b79b0

Please sign in to comment.