Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: earthly/actions-setup
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0.11
Choose a base ref
...
head repository: earthly/actions-setup
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.0.12
Choose a head ref

Commits on Mar 18, 2024

  1. Copy the full SHA
    b61aa1f View commit details
  2. Merge pull request #42 from earthly/ido-update-earthly-npm

    Update Earthfile version and npm image
    idodod authored Mar 18, 2024
    Copy the full SHA
    8c6d0ea View commit details

Commits on Mar 19, 2024

  1. Add renovate.json

    renovate[bot] authored Mar 19, 2024
    Copy the full SHA
    5d49a6b View commit details
  2. Copy the full SHA
    a57a35c View commit details
  3. Merge pull request #43 from earthly/renovate/configure

    chore: Configure Renovate
    idodod authored Mar 19, 2024
    Copy the full SHA
    dff253b View commit details

Commits on Mar 20, 2024

  1. Copy the full SHA
    a01a181 View commit details
  2. Merge pull request #49 from earthly/renovate/actions-checkout-4.x

    chore(deps): update actions/checkout action to v4
    idodod authored Mar 20, 2024
    Copy the full SHA
    c88d3ab View commit details
  3. Copy the full SHA
    f53197e View commit details
  4. Merge pull request #50 from earthly/renovate/actions-setup-node-4.x

    chore(deps): update actions/setup-node action to v4
    idodod authored Mar 20, 2024
    Copy the full SHA
    269fa3a View commit details
  5. Copy the full SHA
    779d37a View commit details
  6. Update renovate.json5

    idodod authored Mar 20, 2024
    Copy the full SHA
    7b19051 View commit details

Commits on Mar 25, 2024

  1. Merge pull request #54 from earthly/ido-renovate-update

    Renovate configuration - group dependencies in fewer PRs
    idodod authored Mar 25, 2024
    Copy the full SHA
    a6ab949 View commit details

Commits on Mar 26, 2024

  1. Update renovate.json5

    idodod authored Mar 26, 2024
    Copy the full SHA
    16054f5 View commit details
  2. auto update dist for renovate

    idodod committed Mar 26, 2024
    Copy the full SHA
    0fa3f48 View commit details
  3. Copy the full SHA
    cd7f49c View commit details
  4. disable docker login

    idodod committed Mar 26, 2024
    Copy the full SHA
    81e4c70 View commit details
  5. set the branch on checkout

    idodod committed Mar 26, 2024
    Copy the full SHA
    3d87584 View commit details
  6. revert after test

    idodod committed Mar 26, 2024
    Copy the full SHA
    fa83f73 View commit details
  7. rename job

    idodod committed Mar 26, 2024
    Copy the full SHA
    1b9ddfb View commit details
  8. rename job

    idodod committed Mar 26, 2024
    Copy the full SHA
    cfaf91e View commit details
  9. rename job; add concurrency

    idodod committed Mar 26, 2024
    Copy the full SHA
    2054076 View commit details
  10. Merge pull request #66 from earthly/ido-renovate-schedule

    Renovate Config - Set schedule and limit for PRs
    idodod authored Mar 26, 2024
    Copy the full SHA
    dc23b46 View commit details
  11. Copy the full SHA
    1cdb55c View commit details
  12. Copy the full SHA
    333b449 View commit details
  13. Add new lines

    idodod committed Mar 26, 2024
    Copy the full SHA
    12b4a4e View commit details
  14. Merge pull request #67 from earthly/ido-auto-update-dist-for-renovate

    Auto update dist for renovate
    idodod authored Mar 26, 2024
    Copy the full SHA
    fcc9066 View commit details
  15. merge

    idodod committed Mar 26, 2024
    Copy the full SHA
    83a6be3 View commit details
  16. Copy the full SHA
    50a6dbd View commit details
  17. Copy the full SHA
    9b9f454 View commit details
  18. Merge pull request #68 from earthly/ido-auto-update-major-branch

    Auto update major branch upon a new release
    idodod authored Mar 26, 2024
    Copy the full SHA
    36a0143 View commit details
  19. Update renovate-helper.yml

    forgot to rename target in workflow
    idodod authored Mar 26, 2024
    Copy the full SHA
    4f56918 View commit details
  20. Copy the full SHA
    2ef5f7f View commit details
  21. Merge pull request #64 from earthly/renovate/make-dir-4.x

    Update dependency make-dir to v4
    idodod authored Mar 26, 2024
    Copy the full SHA
    44720c7 View commit details
  22. Copy the full SHA
    d8f9116 View commit details
  23. Merge pull request #69 from earthly/renovate/prettier-3.x

    Update dependency prettier to v3
    idodod authored Mar 26, 2024
    Copy the full SHA
    a058b56 View commit details
  24. Copy the full SHA
    c25feec View commit details
  25. Merge pull request #70 from earthly/renovate/actions-github-6.x

    Update dependency @actions/github to v6
    idodod authored Mar 26, 2024
    Copy the full SHA
    b1a3ab3 View commit details
  26. Copy the full SHA
    63ef26b View commit details
  27. Merge pull request #71 from earthly/renovate/jest-playback-4.x

    Update dependency jest-playback to v4
    idodod authored Mar 26, 2024
    Copy the full SHA
    1f24c37 View commit details
  28. Update npm (non-major)

    renovate[bot] authored Mar 26, 2024
    Copy the full SHA
    7432940 View commit details
  29. Copy the full SHA
    5516309 View commit details
  30. Merge pull request #73 from earthly/renovate/npm-(non-major)

    Update npm (non-major)
    idodod authored Mar 26, 2024
    Copy the full SHA
    93b38a7 View commit details
  31. Copy the full SHA
    1d7709d View commit details
  32. Copy the full SHA
    2b730a4 View commit details
  33. Merge pull request #72 from earthly/renovate/typescript-5.x

    Update dependency typescript to v5
    idodod authored Mar 26, 2024
    Copy the full SHA
    0bc1e9c View commit details
  34. Copy the full SHA
    d7fae6d View commit details
  35. Merge pull request #74 from earthly/renovate/node-20.x

    Update dependency @types/node to v20
    idodod authored Mar 26, 2024
    Copy the full SHA
    d933628 View commit details
  36. Copy the full SHA
    4447e05 View commit details
  37. Merge pull request #75 from earthly/renovate/major-typescript-eslint-…

    …monorepo
    
    Update typescript-eslint monorepo to v7 (major)
    idodod authored Mar 26, 2024
    Copy the full SHA
    21b55cb View commit details
  38. Copy the full SHA
    23ec6ef View commit details
File renamed without changes.
47 changes: 47 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
$schema: "https://docs.renovatebot.com/renovate-schema.json",
extends: [
"config:recommended"
],
configMigration: true,
prHourlyLimit: 1,
schedule: [ // utc timezone
'after 6am on monday',
],
dockerfile: {
fileMatch: [
'Earthfile',
],
},
labels: [
'renovate',
],
packageRules: [
{
// group packages in the same PR according to data source & update type
matchManagers: [
'npm', 'github-actions',
],
matchUpdateTypes: [
'minor',
'patch',
],
groupName: "{{datasource}} (non-major)",
addLabels: [
'non-major',
],
},
{
// add major label to major updates
matchManagers: [
'npm', 'github-actions',
],
matchUpdateTypes: [
'major',
],
addLabels: [
'{{updateType}}',
],
},
],
}
28 changes: 28 additions & 0 deletions .github/workflows/renovate-helper.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
name: Update Renovate Branch

on:
pull_request:
branches: [ main ]

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

jobs:
update-renovate-branch:
if: github.event.pull_request.head.repo.full_name == github.repository && startsWith(github.head_ref, 'renovate/') && github.actor == 'renovate[bot]'
runs-on: ubuntu-latest
env:
FORCE_COLOR: 1
EARTHLY_CONVERSION_PARALLELISM: "5"
EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
EARTHLY_INSTALL_ID: "earthly-actions-setup-githubactions"
steps:
- uses: earthly/actions/setup-earthly@v1
with:
version: v0.8.6
- uses: actions/checkout@v4
with:
ref: ${{ github.head_ref }}
- name: Update Branch
run: earthly --ci -P --push +update-dist-for-renovate
24 changes: 14 additions & 10 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -7,6 +7,10 @@ on:
- "main"
- "releases/*"

concurrency:
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
cancel-in-progress: true

env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -18,10 +22,10 @@ jobs:
platform: [ubuntu-latest]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
cache: ${{ !env.ACT && 'npm' || '' }}
node-version: "16.x"
@@ -35,10 +39,10 @@ jobs:
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
cache: ${{ !env.ACT && 'npm' || '' }}
node-version: "16.x"
@@ -54,10 +58,10 @@ jobs:
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
cache: ${{ !env.ACT && 'npm' || '' }}
node-version: "16.x"
@@ -74,10 +78,10 @@ jobs:
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
cache: ${{ !env.ACT && 'npm' || '' }}
node-version: "16.x"
@@ -94,10 +98,10 @@ jobs:
platform: [ubuntu-latest, macos-latest, windows-latest]
runs-on: ${{ matrix.platform }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
cache: ${{ !env.ACT && 'npm' || '' }}
node-version: "16.x"
23 changes: 23 additions & 0 deletions .github/workflows/update-major-version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Update Major Version Branch

on:
release:
types: [released]

jobs:
update-major-version-branch:
runs-on: ubuntu-latest
env:
FORCE_COLOR: 1
EARTHLY_CONVERSION_PARALLELISM: "5"
EARTHLY_TOKEN: "${{ secrets.EARTHLY_TOKEN }}"
EARTHLY_INSTALL_ID: "earthly-actions-setup-githubactions"
steps:
- uses: earthly/actions/setup-earthly@v1
with:
version: v0.8.6
- uses: actions/checkout@v4
with:
ref: ${{ github.ref }}
- name: Update Branch
run: earthly --ci -P +merge-release-to-major-branch --RELEASE_TAG=${{ github.ref }}
54 changes: 49 additions & 5 deletions Earthfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
VERSION 0.6
VERSION 0.8

PROJECT earthly-technologies/core

ARG EARTHLY_LIB_VERSION=3.0.1
IMPORT github.com/earthly/lib/utils/git:$EARTHLY_LIB_VERSION AS git

npm-base:
FROM alpine:3.19
RUN apk add --update nodejs npm
FROM node:21.7-alpine3.19
COPY ./package.json ./
COPY ./package-lock.json ./
RUN npm install
@@ -19,7 +23,7 @@ code:

lint:
FROM +code
COPY .eslintrc.js .
COPY .eslintrc.cjs .
RUN npm run-script lint

compile:
@@ -40,7 +44,7 @@ test-compile-was-run:
test:
FROM +code
COPY tsconfig.json .
COPY jest.config.js .
COPY vite.config.ts vitest.config.ts .
RUN npm test

test-run:
@@ -94,6 +98,46 @@ lint-newline:
done; \
exit $code

update-dist-for-renovate:
FROM alpine/git
RUN git config --global user.name "renovate[bot]" && \
git config --global user.email "renovate[bot]@users.noreply.github.com" && \
git config --global url."git@github.com:".insteadOf "https://github.com/"

ARG git_repo="earthly/actions-setup"
ARG git_url="git@github.com:$git_repo"
ARG SECRET_PATH=littleredcorvette-id_rsa
DO --pass-args git+DEEP_CLONE --GIT_URL=$git_url --SECRET_PATH=$SECRET_PATH

ARG EARTHLY_GIT_BRANCH
LET branch=$EARTHLY_GIT_BRANCH
RUN --mount=type=secret,id=$SECRET_PATH,mode=0400,target=/root/.ssh/id_rsa \
git checkout $branch
COPY --dir +compile/dist .
RUN git add dist && git commit -m "update dist for Renovate" || echo nothing to commit
RUN --push --mount=type=secret,id=$SECRET_PATH,mode=0400,target=/root/.ssh/id_rsa \
git push origin $branch

merge-release-to-major-branch:
FROM alpine/git
RUN git config --global user.name "littleredcorvette" && \
git config --global user.email "littleredcorvette@users.noreply.github.com" && \
git config --global url."git@github.com:".insteadOf "https://github.com/"

ARG git_repo="earthly/actions-setup"
ARG git_url="git@github.com:$git_repo"
ARG SECRET_PATH=littleredcorvette-id_rsa
DO --pass-args git+DEEP_CLONE --GIT_URL=$git_url --SECRET_PATH=$SECRET_PATH

ARG --required RELEASE_TAG
LET tag=${RELEASE_TAG#refs/tags/}
LET major=$tag
SET major=$(echo ${major%.*})
SET major=$(echo ${major%.*})
RUN --mount=type=secret,id=$SECRET_PATH,mode=0400,target=/root/.ssh/id_rsa \
git checkout $major && git merge --ff-only $tag
RUN --push --mount=type=secret,id=$SECRET_PATH,mode=0400,target=/root/.ssh/id_rsa \
git push origin $major

all:
BUILD +lint
Loading