humanmade / altis-analytics

Analytics module for Altis
https://www.altis-dxp.com/resources/docs/analytics/
GNU General Public License v3.0
9 stars 3 forks source link

Update Travis file reference #225

Closed shadyvb closed 2 years ago

shadyvb commented 2 years ago

Ref https://github.com/humanmade/product-dev/issues/880

roborourke commented 2 years ago

Worth backporting to v10? Can you do the labels and merges while I go through the rest of these?

shadyvb commented 2 years ago

I think we should backport them, yes, otherwise we didn't do much 😅 because Travis will then use the old config version on each version branch.

hm-backport[bot] commented 2 years ago

The backport to v9-branch failed:

Commits ["73012bfe12f00bbd4092d2dd3ae5d5b392d37234"] could not be cherry-picked on top of v9-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v9-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 73012bfe12f00bbd4092d2dd3ae5d5b392d37234
# Create a new branch with these backported commits.
git checkout -b backport-225-to-v9-branch
# Push it to GitHub.
git push --set-upstream origin backport-225-to-v9-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v9-branch and the compare/head branch is backport-225-to-v9-branch.

hm-backport[bot] commented 2 years ago

The backport to v8-branch failed:

Commits ["73012bfe12f00bbd4092d2dd3ae5d5b392d37234"] could not be cherry-picked on top of v8-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v8-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 73012bfe12f00bbd4092d2dd3ae5d5b392d37234
# Create a new branch with these backported commits.
git checkout -b backport-225-to-v8-branch
# Push it to GitHub.
git push --set-upstream origin backport-225-to-v8-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v8-branch and the compare/head branch is backport-225-to-v8-branch.

hm-backport[bot] commented 2 years ago

The backport to v7-branch failed:

Commits ["73012bfe12f00bbd4092d2dd3ae5d5b392d37234"] could not be cherry-picked on top of v7-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v7-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick 73012bfe12f00bbd4092d2dd3ae5d5b392d37234
# Create a new branch with these backported commits.
git checkout -b backport-225-to-v7-branch
# Push it to GitHub.
git push --set-upstream origin backport-225-to-v7-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v7-branch and the compare/head branch is backport-225-to-v7-branch.

shadyvb commented 2 years ago

🤦 the config changes was only introduced in v10, so that's the only applicable version to backport to.

shadyvb commented 2 years ago

Seems like the build is failing still even with the -W flag.. digging.. https://app.travis-ci.com/github/humanmade/altis-core/builds/245794086

shadyvb commented 2 years ago

Going with:

- cd $HOME/test-root && composer require -W "$ALTIS_PACKAGE:dev-${TRAVIS_PULL_REQUEST_BRANCH:-$TRAVIS_BRANCH} as ${jq '.packages[] | select (.name==\"$ALTIS_PACKAGE\") | .version' composer.lock | sed -e 's/\"//g;s/\$/9/'"`

This adds a 9 to the patch version so it is installable.

roborourke commented 2 years ago

If I try that locally I get dev-master so when working on the master branch this would give us dev-master9 by the looks of it. Need a more complex regex to only append 9 if it's a semver tag that's found.

shadyvb commented 2 years ago

Wouldn't the version in CI always be a proper semver though ?

roborourke commented 2 years ago

No not if it's a PR against master as altis/skeleton has this:

https://github.com/humanmade/altis-skeleton/blob/master/composer.json#L5-L11

shadyvb commented 2 years ago

I see, will update.

shadyvb commented 2 years ago

Seems like /^\d/q would quite the replacement if the pattern match, #TIL !

shadyvb commented 2 years ago

for i in dev-master 10.0.3; do echo $i | sed -e 's/"//g;/^dev/q;s/$/9/'; done this seems to work as expected.