Skip to content

Commit

Permalink
remove old workflow
Browse files Browse the repository at this point in the history
Revert "remove old workflow"

This reverts commit bd66abcf56ee62104e701e3e5a9fd3cb776fdb68.

fix workflow
  • Loading branch information
magicxor committed Mar 23, 2024
1 parent 50edc5c commit 5d44cba
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 108 deletions.
106 changes: 0 additions & 106 deletions .github/workflows/build.yml

This file was deleted.

48 changes: 46 additions & 2 deletions .github/workflows/build_and_push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ on:
# see https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#schedule
- cron: '0 0 1 * *'


env:
DOCKER_REGISTRY: magicxor
DOCKER_IMAGE: tor-simple

jobs:
ubuntu_lts_repo:
name: Ubuntu LTS repo tor version
name: tor from Ubuntu LTS repo
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -60,3 +59,48 @@ jobs:
VCS_REF=${{ github.sha }}
BUILD_DATE=${{ steps.get_build_info.outputs.BUILD_DATE }}
BUILD_PLATFORM=${{ runner.os }}/${{ runner.arch }}
ubuntu_rolling_sources:
name: tor from sources
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4

- uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- id: get_build_info
run: |
docker build . --file=ubuntu_rolling_sources/VersionInfo.Dockerfile --progress=plain --no-cache -t tor-version-info
package_versions=$(docker run --rm tor-version-info)
echo "PACKAGE_VERSIONS=$package_versions" >> $GITHUB_OUTPUT
echo "BUILD_DATE=$(date +'%Y-%m-%dT%H:%M:%S')" >> $GITHUB_OUTPUT
# https://github.com/docker/setup-qemu-action
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

# https://github.com/docker/setup-buildx-action
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

# https://github.com/docker/build-push-action
- name: Build and push
uses: docker/build-push-action@v5
with:
push: true
context: ubuntu_rolling_sources/.
no-cache: true
tags: |
${{ env.DOCKER_REGISTRY }}/${{ env.DOCKER_IMAGE }}:${{ steps.get_build_info.outputs.PACKAGE_VERSIONS }}
platforms: |
linux/amd64
linux/arm/v7
linux/arm64/v8
build-args: |
VERSION=${{ steps.get_build_info.outputs.PACKAGE_VERSIONS }}
VCS_REF=${{ github.sha }}
BUILD_DATE=${{ steps.get_build_info.outputs.BUILD_DATE }}
BUILD_PLATFORM=${{ runner.os }}/${{ runner.arch }}

0 comments on commit 5d44cba

Please sign in to comment.