Skip to content

Commit

Permalink
fix workflows
Browse files Browse the repository at this point in the history
  • Loading branch information
danyworks committed Sep 25, 2024
1 parent f3437c1 commit 68a2b67
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 27 deletions.
12 changes: 9 additions & 3 deletions .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ env:
CHROMIUM_BASE_URL: 'https://github.com/ungoogled-software/ungoogled-chromium-macos/releases/download'
CHROMEDRIVER_BASE_URL: 'https://storage.googleapis.com/chrome-for-testing-public'
OUTPUT_DIR: 'ungoogled_chromium'

jobs:
build-macos:
name: Bundle Executable
Expand All @@ -39,7 +40,7 @@ jobs:
- name: Install pipenv
run: |
pip install --user pipenv
echo "$HOME/Library/Python/${{ inputs.python_version }}/bin" >> $GITHUB_PATH
echo "$HOME/.local/bin" >> $GITHUB_PATH
- name: Install dependencies
run: |
Expand All @@ -58,10 +59,15 @@ jobs:
curl -L -o ungoogled-chromium.dmg ${{ env.CHROMIUM_BASE_URL }}/${{ inputs.chromium_version }}/ungoogled-chromium_${{ inputs.chromium_version }}_x86-64-macos.dmg
mkdir -p ${{ env.OUTPUT_DIR }}
hdiutil attach ungoogled-chromium.dmg
cp -R /Volumes/Ungoogled-Chromium/Ungoogled-Chromium.app ${{ env.OUTPUT_DIR }}/
hdiutil detach /Volumes/Ungoogled-Chromium
# Dynamically get the volume name
VOLUME_NAME=$(ls /Volumes | grep -i "Chromium")
cp -R /Volumes/$VOLUME_NAME/Chromium.app ${{ env.OUTPUT_DIR }}/
hdiutil detach /Volumes/$VOLUME_NAME
ls -la ${{ env.OUTPUT_DIR }}
- name: Cache ChromeDriver
id: cache-chromedriver
uses: actions/cache@v4
Expand Down
48 changes: 24 additions & 24 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ on:
- 'v*'

jobs:
build-linux:
name: Linux x64
uses: ./.github/workflows/build-linux.yml
with:
python_version: '3.10'
chromium_version: '129.0.6668.58-1'
# build-linux:
# name: Linux x64
# uses: ./.github/workflows/build-linux.yml
# with:
# python_version: '3.10'
# chromium_version: '129.0.6668.58-1'

build-macos:
name: macOS x64
Expand All @@ -22,25 +22,25 @@ jobs:
chromium_version: '129.0.6668.58-1.1'
chromedriver_version: '131.0.6724.0'

build-windows:
name: Windows x64
uses: ./.github/workflows/build-windows.yml
with:
python_version: '3.10'
chromium_version: '129.0.6668.58-1.1'
chromedriver_version: '131.0.6724.0'
# build-windows:
# name: Windows x64
# uses: ./.github/workflows/build-windows.yml
# with:
# python_version: '3.10'
# chromium_version: '129.0.6668.58-1.1'
# chromedriver_version: '131.0.6724.0'

build-docker:
name: Docker
uses: ./.github/workflows/build-docker.yml
with:
repo: 'ghcr.io/${{ github.repository }}'
context_path: '.'
image: 'scrapegoat'
tag: ${{ github.ref_name }}
dockerfile_path: './GoatFile'
secrets:
PACKAGES_TOKEN: ${{ secrets.PACKAGES_TOKEN }}
# build-docker:
# name: Docker
# uses: ./.github/workflows/build-docker.yml
# with:
# repo: 'ghcr.io/${{ github.repository }}'
# context_path: '.'
# image: 'scrapegoat'
# tag: ${{ github.ref_name }}
# dockerfile_path: './GoatFile'
# secrets:
# PACKAGES_TOKEN: ${{ secrets.PACKAGES_TOKEN }}

# create-release:
# needs: [build-linux, build-macos, build-windows, build-docker]
Expand Down

0 comments on commit 68a2b67

Please sign in to comment.