diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 14df8d9..c804561 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -43,11 +43,40 @@ jobs: with: tag: ${{env.VERSION}} - docs: - name: Publish CDN & Docs - needs: build - uses: ztimson/actions/.github/workflows/docker.yaml@develop - with: - name: ztimson/css-utils - repository: ${{github.server_url}}/${{github.repository}}.git - pass: ${{secrets.DEPLOY_TOKEN}} + container: + name: Build Container + runs-on: ubuntu-latest + container: docker + steps: + - name: Build Container + run: | + git clone -b "${{github.ref_name}}" "$(echo ${{github.server_url}}/${{github.repository}}.git | sed s%://%://${{github.token}}@% )" . + DOCKER_HUB=$([ -n "${{secrets.DOCKER_HUB_USER}}" ] && [ -n "${{secrets.DOCKER_HUB_TOKEN}}" ] && [ -n "${{secrets.DOCKER_HUB_IMAGE}}" ] && echo "true" || echo "false") + REGISTRY="$(echo "${{github.server_url}}" | sed -E 's|https?://||')" + VERSION=$(cat package.json | grep version | grep -Eo '[0-9][[:alnum:]\.\/\-]+') + + docker login -u "${{github.repository_owner}}" -p "${{secrets.DEPLOY_TOKEN}}" "$REGISTRY" + if [ "$DOCKER_HUB" = "true" ]; then docker login -u "${{secrets.DOCKER_HUB_USER}}" -p "${{secrets.DOCKER_HUB_TOKEN}}" docker.io; fi + + docker build -t "$REGISTRY/${{github.repository}}:${{github.ref_name}}" . + docker push "$REGISTRY/${{github.repository}}:${{github.ref_name}}" + if [ "$DOCKER_HUB" = "true" ]; then + docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:${{github.ref_name}}" + docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:${{github.ref_name}}" + fi + + if [ "${{github.ref_name}}" = "master" ]; then + docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "$REGISTRY/${{github.repository}}:$VERSION" + docker push "$REGISTRY/${{github.repository}}:$VERSION" + if [ "$DOCKER_HUB" = "true" ]; then + docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:$VERSION" + docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:$VERSION" + fi + + docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "$REGISTRY/${{github.repository}}:latest" + docker push "$REGISTRY/${{github.repository}}:latest" + if [ "$DOCKER_HUB" = "true" ]; then + docker tag "$REGISTRY/${{github.repository}}:${{github.ref_name}}" "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:latest" + docker push "docker.io/${{secrets.DOCKER_HUB_IMAGE}}:latest" + fi + fi diff --git a/package-lock.json b/package-lock.json index 2b1d4ac..e0b99e6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@ztimson/css-utils", - "version": "1.3.3", + "version": "1.3.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@ztimson/css-utils", - "version": "1.3.3", + "version": "1.3.4", "license": "MIT", "devDependencies": { "sass": "^1.80.6" diff --git a/src/main.scss b/src/main.scss index e2022f3..1a1f393 100644 --- a/src/main.scss +++ b/src/main.scss @@ -447,6 +447,7 @@ $divisible: (0, 10, 20, 25, 30, 33, 34, 40, 50, 60, 66, 70, 75, 80, 90, 100); .hidden#{$bp} { visibility: hidden !important; } @each $s, $size in $sizes { + .gap#{$bp}-#{$s} { gap: $size !important; } // Gap .b#{$bp}-#{$s} { border: #{$s}px solid var(--theme-border) !important; } // Border .m#{$bp}-#{$s} { margin: $size !important; } // Margin .p#{$bp}-#{$s} { padding: $size !important; } // Padding